diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2017-02-19 00:54:57 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2017-02-19 00:54:57 +0100 |
| commit | 2e10cd9c4378cc3beb3d91d004b8e48e63f0bd57 (patch) | |
| tree | 1d54855fbe7b2a4e977c8bf3a144f6b488bf4392 /target | |
| parent | c477b96e2be62a23ed2473bb92a3c840c3bf92d3 (diff) | |
more h8300 work, add u-boot
Diffstat (limited to 'target')
| -rw-r--r-- | target/config/Config.in.kernelfmt | 4 | ||||
| -rw-r--r-- | target/config/Config.in.tools | 12 | ||||
| -rw-r--r-- | target/h8300/Makefile | 10 | ||||
| -rw-r--r-- | target/h8300/systems/hitachi-edosk2674 | 3 |
4 files changed, 27 insertions, 2 deletions
diff --git a/target/config/Config.in.kernelfmt b/target/config/Config.in.kernelfmt index dbc21f56a..2a2ef5931 100644 --- a/target/config/Config.in.kernelfmt +++ b/target/config/Config.in.kernelfmt @@ -16,6 +16,9 @@ config ADK_TARGET_KERNEL_IMAGE config ADK_TARGET_KERNEL_UIMAGE bool +config ADK_TARGET_KERNEL_UIMAGEBIN + bool + config ADK_TARGET_KERNEL_BZIMAGE bool @@ -31,6 +34,7 @@ config ADK_TARGET_KERNEL_XIPIMAGE config ADK_TARGET_KERNEL string default "uImage" if ADK_TARGET_KERNEL_UIMAGE + default "uImage.bin" if ADK_TARGET_KERNEL_UIMAGEBIN default "zImage" if ADK_TARGET_KERNEL_ZIMAGE default "Image" if ADK_TARGET_KERNEL_IMAGE default "linux.bin" if ADK_TARGET_KERNEL_LINUXBIN diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools index 66b717cda..adff5da98 100644 --- a/target/config/Config.in.tools +++ b/target/config/Config.in.tools @@ -93,6 +93,14 @@ config ADK_HOST_BUILD_GREP config ADK_HOST_BUILD_U_BOOT bool + depends on !ADK_TARGET_ARCH_H8300 + default y if ADK_HOST_NEED_UBOOT + default n + +config ADK_HOST_BUILD_U_BOOT_H8300 + bool + depends on ADK_TARGET_ARCH_H8300 + default y if ADK_HOST_NEED_UBOOT default n config ADK_HOST_BUILD_OPENOCD @@ -275,6 +283,10 @@ config ADK_HOST_BUILD_KMOD bool default n +config ADK_HOST_NEED_U_BOOT + bool + default n + source "target/config/Config.in.prereq" config ADK_COMPRESSION_TOOL diff --git a/target/h8300/Makefile b/target/h8300/Makefile index 6c0add73e..48a8b1e52 100644 --- a/target/h8300/Makefile +++ b/target/h8300/Makefile @@ -6,10 +6,14 @@ include $(ADK_TOPDIR)/mk/kernel-build.mk include $(ADK_TOPDIR)/mk/image.mk KERNEL:=$(LINUX_DIR)/vmlinux +OSTRIP:=-R .reginfo -R .notes -R .note -R .comment -R .mdebug -R .note.gnu.build-id +ifeq ($(ADK_TARGET_KERNEL_ZIMAGE),y) +KERNEL:=$(LINUX_DIR)/arch/h8300/boot/zImage +OSTRIP:= +endif ifeq ($(ADK_TARGET_KERNEL_VMLINUX_SREC),y) KERNEL:=$(LINUX_DIR)/arch/h8300/boot/vmlinux.srec endif -OSTRIP:=-R .reginfo -R .notes -R .note -R .comment -R .mdebug -R .note.gnu.build-id # target helper text ifeq ($(ADK_TARGET_FS),initramfs) @@ -43,7 +47,11 @@ targethelp: endif kernel-strip: +ifneq ($(OSTRIP),) $(TARGET_CROSS)objcopy $(OSTRIP) -S $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL) +else + @cp $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL) +endif kernel-install: kernel-strip @cp $(BUILD_DIR)/$(TARGET_KERNEL) $(FW_DIR)/$(TARGET_KERNEL) diff --git a/target/h8300/systems/hitachi-edosk2674 b/target/h8300/systems/hitachi-edosk2674 index 74fcbc1cd..a9a125fcc 100644 --- a/target/h8300/systems/hitachi-edosk2674 +++ b/target/h8300/systems/hitachi-edosk2674 @@ -2,8 +2,9 @@ config ADK_TARGET_SYSTEM_HITACHI_EDOSK2674 bool "Hitachi EDOSK2674" select ADK_TARGET_CPU_H8S select ADK_TARGET_PACKAGE_TXZ - select ADK_TARGET_KERNEL_VMLINUX_SREC select ADK_TARGET_KERNEL_WITH_COMPRESSION + select ADK_HOST_BUILD_U_BOOT_H8300 + select ADK_TARGET_KERNEL_UIMAGEBIN help Hitachi EDOSK2674 H8S development board. |