summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2024-08-14 16:38:28 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2024-08-26 10:21:09 +0200
commit2c1a56309f37ff0eda843acc8ab58d1da8bdc0fa (patch)
tree9b583d8de03b798bcc4c842fde7ca3434d0d984b /target
parentf2ad29e7c05fd249acf58d5523f53ea014b853cf (diff)
imgtec-ci20: use uImage.gz, boots with defconfig
Diffstat (limited to 'target')
-rw-r--r--target/config/Config.in.kernelfmt4
-rw-r--r--target/linux/Config.in.kernelcfg1
-rw-r--r--target/mips/Makefile13
-rw-r--r--target/mips/systems/imgtec-ci202
4 files changed, 12 insertions, 8 deletions
diff --git a/target/config/Config.in.kernelfmt b/target/config/Config.in.kernelfmt
index 23d800d24..2a1fb1e9f 100644
--- a/target/config/Config.in.kernelfmt
+++ b/target/config/Config.in.kernelfmt
@@ -19,6 +19,9 @@ config ADK_TARGET_KERNEL_UIMAGE
config ADK_TARGET_KERNEL_UIMAGEBIN
bool
+config ADK_TARGET_KERNEL_UIMAGEGZ
+ bool
+
config ADK_TARGET_KERNEL_BZIMAGE
bool
@@ -54,6 +57,7 @@ config ADK_TARGET_KERNEL
default "loader" if ADK_TARGET_KERNEL_LOADER
default "uImage" if ADK_TARGET_KERNEL_UIMAGE
default "uImage.bin" if ADK_TARGET_KERNEL_UIMAGEBIN
+ default "uImage.gz" if ADK_TARGET_KERNEL_UIMAGEGZ
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/linux/Config.in.kernelcfg b/target/linux/Config.in.kernelcfg
index 3a1b60164..6817795e7 100644
--- a/target/linux/Config.in.kernelcfg
+++ b/target/linux/Config.in.kernelcfg
@@ -67,6 +67,7 @@ config ADK_TARGET_LINUX_KERNEL_DEFCONFIG
default "haps_arc64_defconfig" if ADK_TARGET_CPU_ARC_ARC64
default "m5208evb_defconfig" if ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208
default "default_defconfig" if ADK_TARGET_ARCH_KVX
+ default "ci20_defconfig" if ADK_TARGET_SYSTEM_IMGTEC_CI20
default ""
config ADK_TARGET_LINUX_KERNEL_CUSTOMCONFIG_PATH
diff --git a/target/mips/Makefile b/target/mips/Makefile
index db66205bd..2255ffa42 100644
--- a/target/mips/Makefile
+++ b/target/mips/Makefile
@@ -9,6 +9,9 @@ KERNEL:=$(LINUX_DIR)/$(ADK_TARGET_KERNEL)
ifeq ($(ADK_TARGET_KERNEL_UIMAGE),y)
KERNEL:=$(LINUX_DIR)/arch/mips/boot/uImage
endif
+ifeq ($(ADK_TARGET_KERNEL_UIMAGEGZ),y)
+KERNEL:=$(LINUX_DIR)/arch/mips/boot/uImage.gz
+endif
OSTRIP:=-R .reginfo -R .notes -R .note -R .comment -R .mdebug -R .note.gnu.build-id
@@ -76,12 +79,12 @@ targethelp:
endif
ifeq ($(ADK_TARGET_FS),genimage)
targethelp:
- @echo "The disk image is: $(FW_DIR)/disk.img"
+ @echo "The disk image is: $(FW_DIR)/sdcard.img"
ifeq ($(ADK_TARGET_QEMU),y)
@echo 'qemu-system-${ADK_TARGET_CPU_ARCH} ${QEMU_ARGS} $(FW_DIR)/disk.img'
else
@echo "Use following command to install it on SD card:"
- @echo 'sudo dd if=$(FW_DIR)/disk.img of=/dev/sdX bs=2048k'
+ @echo 'sudo dd if=$(FW_DIR)/sdcard.img of=/dev/sdX bs=2048k'
endif
endif
ifeq ($(ADK_TARGET_FS),ubifs)
@@ -90,13 +93,9 @@ targethelp:
@echo 'The UBI image is: ${FW_DIR}/${ROOTFSUBIFS}'
endif
-# image creation and kernel install
+# dummy
kernel-strip:
-ifeq ($(ADK_TARGET_KERNEL_UIMAGE),)
- $(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/mips/systems/imgtec-ci20 b/target/mips/systems/imgtec-ci20
index 82ea79683..bd2f750d1 100644
--- a/target/mips/systems/imgtec-ci20
+++ b/target/mips/systems/imgtec-ci20
@@ -10,7 +10,7 @@ config ADK_TARGET_SYSTEM_IMGTEC_CI20
select ADK_TARGET_WITH_NETDEVICE
select ADK_TARGET_WITH_BLOCK
select ADK_TARGET_KERNEL_WITH_COMPRESSION
- select ADK_TARGET_KERNEL_UIMAGE
+ select ADK_TARGET_KERNEL_UIMAGEGZ
select ADK_PACKAGE_U_BOOT
select ADK_HOST_BUILD_U_BOOT
help