Skip to content

Commit 007ee8a

Browse files
LapshinLapshin
committed
libgloss: xtensa: add esp32s2 board support
1 parent 0bcacf3 commit 007ee8a

File tree

8 files changed

+128
-14
lines changed

8 files changed

+128
-14
lines changed

‎libgloss/Makefile.in‎

Lines changed: 49 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -238,10 +238,14 @@ check_PROGRAMS = $(am__EXEEXT_2) $(am__EXEEXT_3)
238238
@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_44 = xtensa/boards/esp32/board.c
239239
@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_45 = -I$(srcdir)/xtensa/boards/esp32/include
240240
@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_46 = -I$(srcdir)/xtensa/boards/esp32/include
241-
@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_47 = xtensa/boards/esp32s3/memory.elf.ld
242-
@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_48 = xtensa/boards/esp32s3/board.c
243-
@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_49 = -I$(srcdir)/xtensa/boards/esp32s3/include
244-
@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_50 = -I$(srcdir)/xtensa/boards/esp32s3/include
241+
@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S2_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_47 = xtensa/boards/esp32s2/memory.elf.ld
242+
@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S2_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_48 = xtensa/boards/esp32s2/board.c
243+
@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S2_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_49 = -I$(srcdir)/xtensa/boards/esp32s2/include
244+
@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S2_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_50 = -I$(srcdir)/xtensa/boards/esp32s2/include
245+
@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_51 = xtensa/boards/esp32s3/memory.elf.ld
246+
@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_52 = xtensa/boards/esp32s3/board.c
247+
@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_53 = -I$(srcdir)/xtensa/boards/esp32s3/include
248+
@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_54 = -I$(srcdir)/xtensa/boards/esp32s3/include
245249
subdir = .
246250
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
247251
am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \
@@ -757,13 +761,15 @@ riscv_libsim_a_OBJECTS = $(am_riscv_libsim_a_OBJECTS)
757761
xtensa_libgloss_a_AR = $(AR) $(ARFLAGS)
758762
xtensa_libgloss_a_LIBADD =
759763
@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__objects_9 = xtensa/boards/esp32/xtensa_libgloss_a-board.$(OBJEXT)
760-
@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__objects_10 = xtensa/boards/esp32s3/xtensa_libgloss_a-board.$(OBJEXT)
764+
@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S2_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__objects_10 = xtensa/boards/esp32s2/xtensa_libgloss_a-board.$(OBJEXT)
765+
@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__objects_11 = xtensa/boards/esp32s3/xtensa_libgloss_a-board.$(OBJEXT)
761766
@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am_xtensa_libgloss_a_OBJECTS = xtensa/xtensa_libgloss_a-clibrary_init.$(OBJEXT) \
762767
@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ xtensa/xtensa_libgloss_a-sleep.$(OBJEXT) \
763768
@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ xtensa/xtensa_libgloss_a-syscalls.$(OBJEXT) \
764769
@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ xtensa/xtensa_libgloss_a-window-vectors.$(OBJEXT) \
765770
@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__objects_9) \
766-
@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__objects_10)
771+
@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__objects_10) \
772+
@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__objects_11)
767773
xtensa_libgloss_a_OBJECTS = $(am_xtensa_libgloss_a_OBJECTS)
768774
xtensa_libsys_openocd_a_AR = $(AR) $(ARFLAGS)
769775
xtensa_libsys_openocd_a_LIBADD =
@@ -1066,7 +1072,7 @@ multilibtool_DATA = $(am__append_3) $(am__append_6) $(am__append_7) \
10661072
$(am__append_18) $(am__append_22) $(am__append_23) \
10671073
$(am__append_27) $(am__append_29) $(am__append_32) \
10681074
$(am__append_34) $(am__append_39) $(am__append_41) \
1069-
$(am__append_43) $(am__append_47)
1075+
$(am__append_43) $(am__append_47) $(am__append_51)
10701076
multilibtool_LIBRARIES = $(am__append_2) $(am__append_5) \
10711077
$(am__append_9) $(am__append_11) $(am__append_20) \
10721078
$(am__append_21) $(am__append_24) $(am__append_28) \
@@ -1514,21 +1520,25 @@ TEXINFO_TEX = ../texinfo/texinfo.tex
15141520
@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ xtensa/syscalls.c \
15151521
@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ xtensa/window-vectors.S \
15161522
@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__append_44) \
1517-
@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__append_48)
1523+
@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__append_48) \
1524+
@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__append_52)
15181525
@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@xtensa_libsys_qemu_a_CPPFLAGS = -DQEMU_SEMIHOSTING \
15191526
@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__append_45) \
1520-
@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__append_49)
1527+
@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__append_49) \
1528+
@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__append_53)
15211529
@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@xtensa_libsys_qemu_a_SOURCES = \
15221530
@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ xtensa/sim-vectors.S \
15231531
@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ xtensa/sim-call.S \
15241532
@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ xtensa/syscalls.c
15251533

15261534
@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@xtensa_libsys_openocd_a_CPPFLAGS = -DOPENOCD_SEMIHOSTING \
15271535
@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__append_46) \
1528-
@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__append_50)
1536+
@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__append_50) \
1537+
@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ $(am__append_54)
15291538
@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@xtensa_libsys_openocd_a_SOURCES = \
15301539
@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@ xtensa/syscalls.c
15311540

1541+
@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S2_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@xtensa_libgloss_a_CPPFLAGS = -I$(srcdir)/xtensa/boards/esp32s2/include
15321542
@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@xtensa_libgloss_a_CPPFLAGS = -I$(srcdir)/xtensa/boards/esp32s3/include
15331543
@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@xtensa_libgloss_a_CPPFLAGS = -I$(srcdir)/xtensa/boards/esp32/include
15341544
all: config.h
@@ -2600,6 +2610,15 @@ xtensa/boards/esp32/$(DEPDIR)/$(am__dirstamp):
26002610
xtensa/boards/esp32/xtensa_libgloss_a-board.$(OBJEXT): \
26012611
xtensa/boards/esp32/$(am__dirstamp) \
26022612
xtensa/boards/esp32/$(DEPDIR)/$(am__dirstamp)
2613+
xtensa/boards/esp32s2/$(am__dirstamp):
2614+
@$(MKDIR_P) xtensa/boards/esp32s2
2615+
@: > xtensa/boards/esp32s2/$(am__dirstamp)
2616+
xtensa/boards/esp32s2/$(DEPDIR)/$(am__dirstamp):
2617+
@$(MKDIR_P) xtensa/boards/esp32s2/$(DEPDIR)
2618+
@: > xtensa/boards/esp32s2/$(DEPDIR)/$(am__dirstamp)
2619+
xtensa/boards/esp32s2/xtensa_libgloss_a-board.$(OBJEXT): \
2620+
xtensa/boards/esp32s2/$(am__dirstamp) \
2621+
xtensa/boards/esp32s2/$(DEPDIR)/$(am__dirstamp)
26032622
xtensa/boards/esp32s3/$(am__dirstamp):
26042623
@$(MKDIR_P) xtensa/boards/esp32s3
26052624
@: > xtensa/boards/esp32s3/$(am__dirstamp)
@@ -2713,6 +2732,7 @@ mostlyclean-compile:
27132732
-rm -f riscv/esp/*.$(OBJEXT)
27142733
-rm -f xtensa/*.$(OBJEXT)
27152734
-rm -f xtensa/boards/esp32/*.$(OBJEXT)
2735+
-rm -f xtensa/boards/esp32s2/*.$(OBJEXT)
27162736
-rm -f xtensa/boards/esp32s3/*.$(OBJEXT)
27172737

27182738
distclean-compile:
@@ -3092,6 +3112,7 @@ distclean-compile:
30923112
@AMDEP_TRUE@@am__include@ @am__quote@xtensa/$(DEPDIR)/xtensa_libsys_qemu_a-sim-vectors.Po@am__quote@
30933113
@AMDEP_TRUE@@am__include@ @am__quote@xtensa/$(DEPDIR)/xtensa_libsys_qemu_a-syscalls.Po@am__quote@
30943114
@AMDEP_TRUE@@am__include@ @am__quote@xtensa/boards/esp32/$(DEPDIR)/xtensa_libgloss_a-board.Po@am__quote@
3115+
@AMDEP_TRUE@@am__include@ @am__quote@xtensa/boards/esp32s2/$(DEPDIR)/xtensa_libgloss_a-board.Po@am__quote@
30953116
@AMDEP_TRUE@@am__include@ @am__quote@xtensa/boards/esp32s3/$(DEPDIR)/xtensa_libgloss_a-board.Po@am__quote@
30963117

30973118
.S.o:
@@ -5436,6 +5457,20 @@ xtensa/boards/esp32/xtensa_libgloss_a-board.obj: xtensa/boards/esp32/board.c
54365457
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
54375458
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xtensa_libgloss_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xtensa/boards/esp32/xtensa_libgloss_a-board.obj `if test -f 'xtensa/boards/esp32/board.c'; then $(CYGPATH_W) 'xtensa/boards/esp32/board.c'; else $(CYGPATH_W) '$(srcdir)/xtensa/boards/esp32/board.c'; fi`
54385459

5460+
xtensa/boards/esp32s2/xtensa_libgloss_a-board.o: xtensa/boards/esp32s2/board.c
5461+
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xtensa_libgloss_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xtensa/boards/esp32s2/xtensa_libgloss_a-board.o -MD -MP -MF xtensa/boards/esp32s2/$(DEPDIR)/xtensa_libgloss_a-board.Tpo -c -o xtensa/boards/esp32s2/xtensa_libgloss_a-board.o `test -f 'xtensa/boards/esp32s2/board.c' || echo '$(srcdir)/'`xtensa/boards/esp32s2/board.c
5462+
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) xtensa/boards/esp32s2/$(DEPDIR)/xtensa_libgloss_a-board.Tpo xtensa/boards/esp32s2/$(DEPDIR)/xtensa_libgloss_a-board.Po
5463+
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xtensa/boards/esp32s2/board.c' object='xtensa/boards/esp32s2/xtensa_libgloss_a-board.o' libtool=no @AMDEPBACKSLASH@
5464+
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
5465+
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xtensa_libgloss_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xtensa/boards/esp32s2/xtensa_libgloss_a-board.o `test -f 'xtensa/boards/esp32s2/board.c' || echo '$(srcdir)/'`xtensa/boards/esp32s2/board.c
5466+
5467+
xtensa/boards/esp32s2/xtensa_libgloss_a-board.obj: xtensa/boards/esp32s2/board.c
5468+
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xtensa_libgloss_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xtensa/boards/esp32s2/xtensa_libgloss_a-board.obj -MD -MP -MF xtensa/boards/esp32s2/$(DEPDIR)/xtensa_libgloss_a-board.Tpo -c -o xtensa/boards/esp32s2/xtensa_libgloss_a-board.obj `if test -f 'xtensa/boards/esp32s2/board.c'; then $(CYGPATH_W) 'xtensa/boards/esp32s2/board.c'; else $(CYGPATH_W) '$(srcdir)/xtensa/boards/esp32s2/board.c'; fi`
5469+
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) xtensa/boards/esp32s2/$(DEPDIR)/xtensa_libgloss_a-board.Tpo xtensa/boards/esp32s2/$(DEPDIR)/xtensa_libgloss_a-board.Po
5470+
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xtensa/boards/esp32s2/board.c' object='xtensa/boards/esp32s2/xtensa_libgloss_a-board.obj' libtool=no @AMDEPBACKSLASH@
5471+
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
5472+
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xtensa_libgloss_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xtensa/boards/esp32s2/xtensa_libgloss_a-board.obj `if test -f 'xtensa/boards/esp32s2/board.c'; then $(CYGPATH_W) 'xtensa/boards/esp32s2/board.c'; else $(CYGPATH_W) '$(srcdir)/xtensa/boards/esp32s2/board.c'; fi`
5473+
54395474
xtensa/boards/esp32s3/xtensa_libgloss_a-board.o: xtensa/boards/esp32s3/board.c
54405475
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xtensa_libgloss_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xtensa/boards/esp32s3/xtensa_libgloss_a-board.o -MD -MP -MF xtensa/boards/esp32s3/$(DEPDIR)/xtensa_libgloss_a-board.Tpo -c -o xtensa/boards/esp32s3/xtensa_libgloss_a-board.o `test -f 'xtensa/boards/esp32s3/board.c' || echo '$(srcdir)/'`xtensa/boards/esp32s3/board.c
54415476
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) xtensa/boards/esp32s3/$(DEPDIR)/xtensa_libgloss_a-board.Tpo xtensa/boards/esp32s3/$(DEPDIR)/xtensa_libgloss_a-board.Po
@@ -5930,6 +5965,8 @@ distclean-generic:
59305965
-rm -f xtensa/$(am__dirstamp)
59315966
-rm -f xtensa/boards/esp32/$(DEPDIR)/$(am__dirstamp)
59325967
-rm -f xtensa/boards/esp32/$(am__dirstamp)
5968+
-rm -f xtensa/boards/esp32s2/$(DEPDIR)/$(am__dirstamp)
5969+
-rm -f xtensa/boards/esp32s2/$(am__dirstamp)
59335970
-rm -f xtensa/boards/esp32s3/$(DEPDIR)/$(am__dirstamp)
59345971
-rm -f xtensa/boards/esp32s3/$(am__dirstamp)
59355972

@@ -5944,7 +5981,7 @@ clean-am: clean-aminfo clean-binPROGRAMS clean-checkPROGRAMS \
59445981

59455982
distclean: distclean-recursive
59465983
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
5947-
-rm -rf ./$(DEPDIR) aarch64/$(DEPDIR) arc/$(DEPDIR) arm/$(DEPDIR) bfin/$(DEPDIR) csky/$(DEPDIR) d30v/$(DEPDIR) iq2000/$(DEPDIR) libnosys/$(DEPDIR) lm32/$(DEPDIR) nios2/$(DEPDIR) riscv/$(DEPDIR) riscv/esp/$(DEPDIR) xtensa/$(DEPDIR) xtensa/boards/esp32/$(DEPDIR) xtensa/boards/esp32s3/$(DEPDIR)
5984+
-rm -rf ./$(DEPDIR) aarch64/$(DEPDIR) arc/$(DEPDIR) arm/$(DEPDIR) bfin/$(DEPDIR) csky/$(DEPDIR) d30v/$(DEPDIR) iq2000/$(DEPDIR) libnosys/$(DEPDIR) lm32/$(DEPDIR) nios2/$(DEPDIR) riscv/$(DEPDIR) riscv/esp/$(DEPDIR) xtensa/$(DEPDIR) xtensa/boards/esp32/$(DEPDIR) xtensa/boards/esp32s2/$(DEPDIR) xtensa/boards/esp32s3/$(DEPDIR)
59485985
-rm -f Makefile
59495986
distclean-am: clean-am distclean-compile distclean-generic \
59505987
distclean-hdr distclean-local distclean-tags
@@ -6087,7 +6124,7 @@ installcheck-am:
60876124
maintainer-clean: maintainer-clean-recursive
60886125
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
60896126
-rm -rf $(top_srcdir)/autom4te.cache
6090-
-rm -rf ./$(DEPDIR) aarch64/$(DEPDIR) arc/$(DEPDIR) arm/$(DEPDIR) bfin/$(DEPDIR) csky/$(DEPDIR) d30v/$(DEPDIR) iq2000/$(DEPDIR) libnosys/$(DEPDIR) lm32/$(DEPDIR) nios2/$(DEPDIR) riscv/$(DEPDIR) riscv/esp/$(DEPDIR) xtensa/$(DEPDIR) xtensa/boards/esp32/$(DEPDIR) xtensa/boards/esp32s3/$(DEPDIR)
6127+
-rm -rf ./$(DEPDIR) aarch64/$(DEPDIR) arc/$(DEPDIR) arm/$(DEPDIR) bfin/$(DEPDIR) csky/$(DEPDIR) d30v/$(DEPDIR) iq2000/$(DEPDIR) libnosys/$(DEPDIR) lm32/$(DEPDIR) nios2/$(DEPDIR) riscv/$(DEPDIR) riscv/esp/$(DEPDIR) xtensa/$(DEPDIR) xtensa/boards/esp32/$(DEPDIR) xtensa/boards/esp32s2/$(DEPDIR) xtensa/boards/esp32s3/$(DEPDIR)
60916128
-rm -f Makefile
60926129
maintainer-clean-am: distclean-am maintainer-clean-aminfo \
60936130
maintainer-clean-generic maintainer-clean-local

‎libgloss/configure‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -593,6 +593,8 @@ HAVE_XTENSA_BOARD_ESP_FALSE
593593
HAVE_XTENSA_BOARD_ESP_TRUE
594594
HAVE_XTENSA_BOARD_ESP32S3_FALSE
595595
HAVE_XTENSA_BOARD_ESP32S3_TRUE
596+
HAVE_XTENSA_BOARD_ESP32S2_FALSE
597+
HAVE_XTENSA_BOARD_ESP32S2_TRUE
596598
HAVE_XTENSA_BOARD_ESP32_FALSE
597599
HAVE_XTENSA_BOARD_ESP32_TRUE
598600
XTENSA_BOARD_ESP
@@ -5130,6 +5132,14 @@ else
51305132
HAVE_XTENSA_BOARD_ESP32_FALSE=
51315133
fi
51325134
5135+
if test x$XTENSA_BOARD_ESP = xesp32s2; then
5136+
HAVE_XTENSA_BOARD_ESP32S2_TRUE=
5137+
HAVE_XTENSA_BOARD_ESP32S2_FALSE='#'
5138+
else
5139+
HAVE_XTENSA_BOARD_ESP32S2_TRUE='#'
5140+
HAVE_XTENSA_BOARD_ESP32S2_FALSE=
5141+
fi
5142+
51335143
if test x$XTENSA_BOARD_ESP = xesp32s3; then
51345144
HAVE_XTENSA_BOARD_ESP32S3_TRUE=
51355145
HAVE_XTENSA_BOARD_ESP32S3_FALSE='#'
@@ -5138,7 +5148,7 @@ else
51385148
HAVE_XTENSA_BOARD_ESP32S3_FALSE=
51395149
fi
51405150
5141-
if echo $XTENSA_BOARD_ESP | grep -w -e esp32 -e esp32s3 >/dev/null 2>&1; then
5151+
if echo $XTENSA_BOARD_ESP | grep -w -e esp32 -e esp32s2 -e esp32s3 >/dev/null 2>&1; then
51425152
HAVE_XTENSA_BOARD_ESP_TRUE=
51435153
HAVE_XTENSA_BOARD_ESP_FALSE='#'
51445154
else
@@ -5427,6 +5437,10 @@ if test -z "${HAVE_XTENSA_BOARD_ESP32_TRUE}" && test -z "${HAVE_XTENSA_BOARD_ESP
54275437
as_fn_error $? "conditional \"HAVE_XTENSA_BOARD_ESP32\" was never defined.
54285438
Usually this means the macro was only invoked conditionally." "$LINENO" 5
54295439
fi
5440+
if test -z "${HAVE_XTENSA_BOARD_ESP32S2_TRUE}" && test -z "${HAVE_XTENSA_BOARD_ESP32S2_FALSE}"; then
5441+
as_fn_error $? "conditional \"HAVE_XTENSA_BOARD_ESP32S2\" was never defined.
5442+
Usually this means the macro was only invoked conditionally." "$LINENO" 5
5443+
fi
54305444
if test -z "${HAVE_XTENSA_BOARD_ESP32S3_TRUE}" && test -z "${HAVE_XTENSA_BOARD_ESP32S3_FALSE}"; then
54315445
as_fn_error $? "conditional \"HAVE_XTENSA_BOARD_ESP32S3\" was never defined.
54325446
Usually this means the macro was only invoked conditionally." "$LINENO" 5

‎libgloss/xtensa/Makefile.inc‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,14 @@ multilibtool_DATA += %D%/boards/esp32/memory.elf.ld
4343
%C%_libsys_openocd_a_CPPFLAGS += -I$(srcdir)/%D%/boards/esp32/include
4444
endif
4545

46+
if HAVE_XTENSA_BOARD_ESP32S2
47+
multilibtool_DATA += %D%/boards/esp32s2/memory.elf.ld
48+
%C%_libgloss_a_SOURCES += %D%/boards/esp32s2/board.c
49+
%C%_libgloss_a_CPPFLAGS = -I$(srcdir)/%D%/boards/esp32s2/include
50+
%C%_libsys_qemu_a_CPPFLAGS += -I$(srcdir)/%D%/boards/esp32s2/include
51+
%C%_libsys_openocd_a_CPPFLAGS += -I$(srcdir)/%D%/boards/esp32s2/include
52+
endif
53+
4654
if HAVE_XTENSA_BOARD_ESP32S3
4755
multilibtool_DATA += %D%/boards/esp32s3/memory.elf.ld
4856
%C%_libgloss_a_SOURCES += %D%/boards/esp32s3/board.c

‎libgloss/xtensa/acinclude.m4‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
XTENSA_BOARD_ESP=`echo $CC | sed 's/.*-mdynconfig=xtensa_\(.*\)\.so.*/\1/;s/.*-mcpu=\(\w*\).*/\1/;s/.* .*/unknown/'`
22
AC_SUBST([XTENSA_BOARD_ESP])
33
AM_CONDITIONAL([HAVE_XTENSA_BOARD_ESP32], [test x$XTENSA_BOARD_ESP = xesp32])
4+
AM_CONDITIONAL([HAVE_XTENSA_BOARD_ESP32S2], [test x$XTENSA_BOARD_ESP = xesp32s2])
45
AM_CONDITIONAL([HAVE_XTENSA_BOARD_ESP32S3], [test x$XTENSA_BOARD_ESP = xesp32s3])
5-
AM_CONDITIONAL([HAVE_XTENSA_BOARD_ESP], [echo $XTENSA_BOARD_ESP | grep -w -e esp32 -e esp32s3 >/dev/null 2>&1])
6+
AM_CONDITIONAL([HAVE_XTENSA_BOARD_ESP], [echo $XTENSA_BOARD_ESP | grep -w -e esp32 -e esp32s2 -e esp32s3 >/dev/null 2>&1])

‎libgloss/xtensa/boards/esp32s2/board.c‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
#include <stdint.h>
2+
#include <soc/uart.h>
3+
4+
void board_init(void)
5+
{
6+
WRITE_REGISTER(UART0_CLKDIV_REG, UART0_CLKDIV_VAL);
7+
}
8+
9+
void board_uart_write_char(char c)
10+
{
11+
/* wait until txfifo_cnt == 0 */
12+
while (UART0_TXFIFO_CNT) {
13+
;
14+
}
15+
if (c == '\n') {
16+
WRITE_REGISTER(UART0_TX_ADDR, '\r');
17+
}
18+
WRITE_REGISTER(UART0_TX_ADDR, c);
19+
}

‎libgloss/xtensa/boards/esp32s2/include/soc/cpu.h‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#ifndef SOC_CPU_H
2+
#define SOC_CPU_H
3+
4+
/*
5+
* ESP32S2 starts with CPU frequency 40MHz
6+
* Let's do not reconfigure it to simplify libgloss
7+
*/
8+
#define CPU_FREQUENCY_MHZ 40
9+
#define CPU_FREQUENCY_HZ (CPU_FREQUENCY_MHZ * 1000000)
10+
11+
#endif // SOC_CPU_H

‎libgloss/xtensa/boards/esp32s2/include/soc/uart.h‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
#ifndef SOC_UART_H
2+
#define SOC_UART_H
3+
4+
#include <soc/cpu.h>
5+
#include <register_access.h>
6+
7+
#define UART0_BAUDRATE 115200
8+
9+
#define UART0_TX_ADDR 0x3f400000
10+
#define UART0_BASE 0x3f400000
11+
#define UART0_CLKDIV_REG (UART0_BASE + 0x14)
12+
#define UART0_STATUS (UART0_BASE + 0x1c)
13+
#define UART0_CLKDIV_VAL (CPU_FREQUENCY_HZ / UART0_BAUDRATE )
14+
#define UART0_TXFIFO_CNT (((READ_REGISTER(UART0_STATUS)) >> 16) & 0x3ff)
15+
16+
17+
void board_uart_write_char(char c);
18+
19+
#endif // SOC_UART_H

‎libgloss/xtensa/boards/esp32s2/memory.elf.ld‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
MEMORY
2+
{
3+
iram_seg (X) : org = 0x40024000, len = 0x2A000
4+
dram_seg (RW) : org = 0x3FFB0000, len = 0x2A000
5+
}

0 commit comments

Comments
 (0)