浏览代码

lm32 workarounds and hacks

Waldemar Brodkorb 7 年之前
父节点
当前提交
cfe6683eb5

+ 0 - 2
target/config/Config.in.binutils

@@ -27,7 +27,6 @@ config ADK_TOOLCHAIN_BINUTILS_2_27
 	bool "2.27"
 	depends on !ADK_TARGET_ARCH_ARC
 	depends on !ADK_TARGET_ARCH_AVR32
-	depends on !ADK_TARGET_ARCH_LM32
 	depends on !ADK_TARGET_ARCH_NDS32
 	depends on !ADK_TARGET_CPU_CRIS_CRISV10
 
@@ -37,7 +36,6 @@ config ADK_TOOLCHAIN_BINUTILS_2_26_1
 	depends on !ADK_TARGET_ARCH_AVR32
 	depends on !ADK_TARGET_ARCH_FRV
 	depends on !ADK_TARGET_ARCH_H8300
-	depends on !ADK_TARGET_ARCH_LM32
 	depends on !ADK_TARGET_ARCH_NDS32
 	depends on !ADK_TARGET_SYSTEM_NUMATO_MIMASV2
 

+ 3 - 0
target/config/Config.in.compiler

@@ -21,6 +21,7 @@ default ADK_TOOLCHAIN_GCC_OR1K if ADK_TARGET_ARCH_OR1K
 default ADK_TOOLCHAIN_GCC_NDS32 if ADK_TARGET_ARCH_NDS32
 default ADK_TOOLCHAIN_GCC_4_2 if ADK_TARGET_ARCH_METAG
 default ADK_TOOLCHAIN_GCC_4_4 if ADK_TARGET_ARCH_AVR32
+default ADK_TOOLCHAIN_GCC_4_9 if ADK_TARGET_ARCH_LM32
 default ADK_TOOLCHAIN_GCC_4_9 if ADK_TARGET_LIB_GLIBC && ADK_TARGET_ARCH_SH
 default ADK_TOOLCHAIN_GCC_4_9 if ADK_TARGET_SYSTEM_KINETIS_K70
 default ADK_TOOLCHAIN_GCC_6 if ADK_TARGET_ARCH_XTENSA
@@ -52,6 +53,7 @@ config ADK_TOOLCHAIN_GCC_6
 	depends on !ADK_TARGET_ARCH_METAG
 	depends on !ADK_TARGET_ARCH_NDS32
 	depends on !ADK_TARGET_ARCH_OR1K
+	depends on !ADK_TARGET_ARCH_LM32
 	select ADK_DISABLE_HONOUR_CFLAGS
 
 config ADK_TOOLCHAIN_GCC_5
@@ -68,6 +70,7 @@ config ADK_TOOLCHAIN_GCC_5
 	depends on !ADK_TARGET_ARCH_NDS32
 	depends on !ADK_TARGET_ARCH_NIOS2
 	depends on !ADK_TARGET_ARCH_OR1K
+	depends on !ADK_TARGET_ARCH_LM32
 	depends on !ADK_TARGET_SYSTEM_KINETIS_K70
 	depends on !(ADK_TARGET_LIB_GLIBC && ADK_TARGET_ARCH_SH)
 	depends on !ADK_TARGET_CPU_MIPS_MIPS32R6

+ 10 - 0
target/lm32/Makefile

@@ -5,3 +5,13 @@ include $(ADK_TOPDIR)/rules.mk
 include $(ADK_TOPDIR)/mk/kernel-build.mk
 include $(ADK_TOPDIR)/mk/image.mk
 
+# filesystem specific targets
+ifeq ($(ADK_TARGET_FS),initramfs)
+imageinstall: kernel-install $(FW_DIR)/$(INITRAMFS) targethelp
+endif
+ifeq ($(ADK_TARGET_FS),initramfsarchive)
+imageinstall: kernel-install $(FW_DIR)/$(ROOTFSUSERTARBALL) targethelp
+endif
+ifeq ($(ADK_TARGET_FS),initramfspiggyback)
+imageinstall: createinitramfs targethelp
+endif

+ 1 - 1
target/lm32/kernel/qemu-lm32

@@ -2,4 +2,4 @@ CONFIG_LM32=y
 CONFIG_PLAT_MILKYMIST=y
 CONFIG_CPU_MICO32=y
 CONFIG_BOARD_MILKYMIST_ONE=y
-
+CONFIG_BUG=y

+ 4 - 0
toolchain/uclibc-ng/Makefile

@@ -310,6 +310,7 @@ $(WRKBUILD)/.compiled: $(WRKBUILD)/.configured
 		UCLIBC_EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \
 		VERBOSE=1 \
 		all
+ifeq ($(ADK_TARGET_ARCH_LM32),)
 	PATH='$(HOST_PATH)' $(MAKE) $(UCLIBC_MAKEOPTS) -C $(WRKBUILD) \
 		ARCH="$(ADK_TARGET_ARCH)" \
 		CROSS_COMPILE="$(TARGET_CROSS)" \
@@ -321,6 +322,7 @@ $(WRKBUILD)/.compiled: $(WRKBUILD)/.configured
 		UCLIBC_EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \
 		VERBOSE=1 \
 		utils
+endif
 	touch $@
 
 $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled
@@ -346,6 +348,7 @@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled
 		UCLIBC_EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \
 		VERBOSE=1 \
 		install_runtime
+ifeq ($(ADK_TARGET_ARCH_LM32),)
 	PATH='$(HOST_PATH)' $(MAKE) -C $(WRKBUILD) \
 		ARCH="$(ADK_TARGET_ARCH)" \
 		CROSS_COMPILE="$(TARGET_CROSS)" \
@@ -357,6 +360,7 @@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled
 		UCLIBC_EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \
 		VERBOSE=1 \
 		install_utils
+endif
 	touch $@
 
 include ${ADK_TOPDIR}/mk/toolchain.mk