diff options
| -rw-r--r-- | mk/vars.mk | 3 | ||||
| -rw-r--r-- | package/mksh/Makefile | 2 | ||||
| -rw-r--r-- | target/config/Config.in.adk | 1 | ||||
| -rw-r--r-- | target/config/Config.in.gdb.choice | 2 | ||||
| -rw-r--r-- | target/config/Config.in.kernelversion.choice | 9 | ||||
| -rw-r--r-- | target/config/Config.in.runtime | 4 | ||||
| -rw-r--r-- | target/h8300/Makefile | 2 | ||||
| -rw-r--r-- | toolchain/binutils/Makefile | 4 |
8 files changed, 21 insertions, 6 deletions
diff --git a/mk/vars.mk b/mk/vars.mk index e43a1f1f7..054fb588c 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -184,7 +184,6 @@ ifeq ($(ADK_TARGET_ARCH_H8300),y) TARGET_CFLAGS+= -mh TARGET_LDFLAGS+= -mh ifeq ($(ADK_TARGET_BINFMT_FLAT),y) -TARGET_LDFLAGS+= -Wl,-elf2flt TARGET_CFLAGS+= -Wl,-elf2flt TARGET_CXXFLAGS+= -Wl,-elf2flt endif @@ -269,7 +268,7 @@ TARGET_CFLAGS+= $(ADK_TARGET_CFLAGS_OPT) TARGET_CXXFLAGS+= $(ADK_TARGET_CFLAGS_OPT) # add compiler flags for debug information -ifeq ($(ADK_BUILD_WITH_DEBUG),y) +ifneq ($(ADK_DEBUG),) TARGET_CFLAGS+= -g3 TARGET_CXXFLAGS+= -g3 endif diff --git a/package/mksh/Makefile b/package/mksh/Makefile index 372aa4f33..c6841daf1 100644 --- a/package/mksh/Makefile +++ b/package/mksh/Makefile @@ -12,7 +12,7 @@ PKG_SECTION:= base/shells PKG_URL:= http://www.mirbsd.org/mksh.htm PKG_SITES:= $(MASTER_SITE_MIRBSD:distfiles/=dist/mir/mksh/) -PKG_DFLT_MKSH:= y if (!ADK_TOOLCHAIN_ONLY && ADK_TARGET_WITH_MMU) +PKG_DFLT_MKSH:= y if !ADK_TOOLCHAIN_ONLY && !ADK_TARGET_WITHOUT_MMU DISTFILES:= $(PKG_NAME)-R$(PKG_VERSION).tgz WRKDIST= $(WRKDIR)/$(PKG_NAME) diff --git a/target/config/Config.in.adk b/target/config/Config.in.adk index 18faa861d..9df26b4ba 100644 --- a/target/config/Config.in.adk +++ b/target/config/Config.in.adk @@ -26,6 +26,7 @@ config ADK_EXPERIMENTAL config ADK_BUILD_WITH_DEBUG bool "Build everything with debug information and allow debug packages" + select ADK_DEBUG default n help If you want to create debug packages, you should enable this option. diff --git a/target/config/Config.in.gdb.choice b/target/config/Config.in.gdb.choice index 6b369f0f8..d03530d25 100644 --- a/target/config/Config.in.gdb.choice +++ b/target/config/Config.in.gdb.choice @@ -9,10 +9,12 @@ config ADK_TOOLCHAIN_GDB_GIT config ADK_TOOLCHAIN_GDB_7_9_1 bool "7.9.1" depends on !ADK_TARGET_ARCH_AVR32 + depends on !ADK_TARGET_ARCH_H8300 config ADK_TOOLCHAIN_GDB_7_8_2 bool "7.8.2" depends on !ADK_TARGET_ARCH_AVR32 + depends on !ADK_TARGET_ARCH_H8300 config ADK_TOOLCHAIN_GDB_6_7_1 bool "6.7.1" diff --git a/target/config/Config.in.kernelversion.choice b/target/config/Config.in.kernelversion.choice index dfdbf2d76..ec886fa6d 100644 --- a/target/config/Config.in.kernelversion.choice +++ b/target/config/Config.in.kernelversion.choice @@ -18,6 +18,7 @@ config ADK_KERNEL_VERSION_4_1_0 depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI || ADK_EXPERIMENTAL depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI2 || ADK_EXPERIMENTAL depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 || ADK_EXPERIMENTAL + depends on !ADK_TARGET_ARCH_H8300 config ADK_KERNEL_VERSION_4_0_6 bool "4.0.6" @@ -25,6 +26,7 @@ config ADK_KERNEL_VERSION_4_0_6 depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI || ADK_EXPERIMENTAL depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI2 || ADK_EXPERIMENTAL depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 || ADK_EXPERIMENTAL + depends on !ADK_TARGET_ARCH_H8300 config ADK_KERNEL_VERSION_3_18_16 bool "3.18.16" @@ -32,6 +34,7 @@ config ADK_KERNEL_VERSION_3_18_16 depends on !ADK_TARGET_ARCH_NIOS2 depends on !ADK_TARGET_SYSTEM_QEMU_SPARC depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 + depends on !ADK_TARGET_ARCH_H8300 select ADK_KERNEL_VERSION_3_18 config ADK_KERNEL_VERSION_3_14_45 @@ -40,6 +43,7 @@ config ADK_KERNEL_VERSION_3_14_45 depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI2 depends on !ADK_TARGET_SYSTEM_QEMU_SPARC + depends on !ADK_TARGET_ARCH_H8300 select ADK_KERNEL_VERSION_3_14 config ADK_KERNEL_VERSION_3_12_44 @@ -50,6 +54,7 @@ config ADK_KERNEL_VERSION_3_12_44 depends on !ADK_TARGET_SYSTEM_QEMU_SPARC depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI2 + depends on !ADK_TARGET_ARCH_H8300 select ADK_KERNEL_VERSION_3_12 config ADK_KERNEL_VERSION_3_10_81 @@ -60,6 +65,7 @@ config ADK_KERNEL_VERSION_3_10_81 depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI2 depends on !ADK_TARGET_ARCH_NIOS2 depends on !ADK_TARGET_SYSTEM_QEMU_SPARC + depends on !ADK_TARGET_ARCH_H8300 select ADK_KERNEL_VERSION_3_10 config ADK_KERNEL_VERSION_3_4_108 @@ -70,6 +76,7 @@ config ADK_KERNEL_VERSION_3_4_108 depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB4XX depends on !ADK_TARGET_ARCH_NIOS2 depends on !ADK_TARGET_SYSTEM_QEMU_SPARC + depends on !ADK_TARGET_ARCH_H8300 select ADK_KERNEL_VERSION_3_4 config ADK_KERNEL_VERSION_3_2_69 @@ -80,6 +87,7 @@ config ADK_KERNEL_VERSION_3_2_69 depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB4XX depends on !ADK_TARGET_ARCH_NIOS2 depends on !ADK_TARGET_SYSTEM_QEMU_SPARC + depends on !ADK_TARGET_ARCH_H8300 select ADK_KERNEL_VERSION_3_2 config ADK_KERNEL_VERSION_2_6_32_67 @@ -90,6 +98,7 @@ config ADK_KERNEL_VERSION_2_6_32_67 depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB4XX depends on !ADK_TARGET_ARCH_NIOS2 depends on !ADK_TARGET_SYSTEM_QEMU_SPARC + depends on !ADK_TARGET_ARCH_H8300 select ADK_KERNEL_VERSION_2_6_32 endchoice diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime index d46e39440..440bc5a76 100644 --- a/target/config/Config.in.runtime +++ b/target/config/Config.in.runtime @@ -246,7 +246,7 @@ config ADK_RUNTIME_KBD_LAYOUT choice prompt "initial login shell for the root user" -default ADK_ROOTSH_SASH if ADK_TARGET_UCLINUX +default ADK_ROOTSH_SASH if ADK_TARGET_WITHOUT_MMU default ADK_ROOTSH_MKSH config ADK_ROOTSH_MKSH @@ -299,7 +299,7 @@ endchoice choice prompt "system /bin/sh (POSIX script shell)" -default ADK_BINSH_SASH if ADK_TARGET_UCLINUX +default ADK_BINSH_SASH if ADK_TARGET_WITHOUT_MMU default ADK_BINSH_MKSH config ADK_BINSH_MKSH diff --git a/target/h8300/Makefile b/target/h8300/Makefile index 462e9f05e..f335b2a0a 100644 --- a/target/h8300/Makefile +++ b/target/h8300/Makefile @@ -25,7 +25,7 @@ targethelp: @echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}' ifeq ($(ADK_TARGET_SIM),y) @echo "Run the simulator via:" - @echo $(TARGET_CROSS)run $(FW_DIR)/$(TARGET_KERNEL) + @echo '$(TARGET_CROSS)run $(FW_DIR)/$(TARGET_KERNEL) "earlyprintk=h8300-sim console=ttySC0"' endif endif diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile index f4f72587c..1dade7c8b 100644 --- a/toolchain/binutils/Makefile +++ b/toolchain/binutils/Makefile @@ -71,6 +71,10 @@ $(WRKBUILD)/.compiled: $(WRKBUILD)/.configured $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled $(MAKE) -C $(WRKBUILD) install +ifeq ($(ADK_TOOLCHAIN_BINUTILS_GIT),y) + $(INSTALL_DIR) $(TOOLCHAIN_DIR)/usr/lib/ldscripts + $(CP) $(WRKBUILD)/ld/ldscripts/* $(TOOLCHAIN_DIR)/usr/lib/ldscripts/ +endif @touch $@ include ${ADK_TOPDIR}/mk/toolchain.mk |