summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mk/build.mk2
-rw-r--r--mk/image.mk10
-rw-r--r--mk/rootfs.mk3
-rw-r--r--package/adk-helper/Makefile2
-rw-r--r--package/squashfs/Makefile1
-rw-r--r--target/arm/sys-available/acmesystems-foxg201
-rw-r--r--target/arm/sys-available/cubox-i1
-rw-r--r--target/arm/sys-available/raspberry-pi1
-rw-r--r--target/config/Config.in39
-rw-r--r--target/config/Config.in.tools15
-rw-r--r--target/linux/config/Config.in.fs4
-rw-r--r--target/mips/sys-available/mikrotik-rb5321
-rw-r--r--target/sh/sys-available/toolchain-sh411
-rw-r--r--target/sh/sys-available/toolchain-sh4eb11
-rw-r--r--target/x86/sys-available/ibm-x401
-rw-r--r--target/x86/sys-available/pcengines-alix1c1
-rw-r--r--target/x86/sys-available/pcengines-alix2d131
-rw-r--r--target/x86/sys-available/pcengines-alix2d21
-rw-r--r--target/x86/sys-available/pcengines-wrap1
19 files changed, 47 insertions, 60 deletions
diff --git a/mk/build.mk b/mk/build.mk
index 78079bea9..af1313206 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -471,9 +471,9 @@ bulktoolchain:
while read arch; do \
mkdir -p ${TOPDIR}/firmware; \
( \
- echo === building $$arch $$libc toolchain-$$arch on $$(date); \
tarch=$$(echo $$arch|sed -e "s#sh4.*#sh#" -e "s#el##" -e "s#eb##" -e "s#mips64.*#mips#" -e "s#hf##" -e "s#x86_64.*#x86_64#" ); \
carch=$$(echo $$arch|sed -e "s#hf##" -e "s#mips64n.*#mips64#" -e "s#mips64el.*#mips64el#" -e 's#x86$$#i686#' -e "s#x86_64.*#x86_64#" ); \
+ echo === building $$tarch $$libc toolchain-$$arch on $$(date); \
$(GMAKE) prereq && \
$(GMAKE) ARCH=$$tarch SYSTEM=toolchain-$$arch LIBC=$$libc defconfig; \
tabi=$$(grep ^ADK_TARGET_ABI= .config|cut -d \" -f 2);\
diff --git a/mk/image.mk b/mk/image.mk
index e2982331b..ee2f991e0 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -60,7 +60,7 @@ ifeq ($(ADK_TARGET_ABI_32),)
rm -rf ${TARGET_DIR}/lib/
ln -sf /${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/lib
-mkdir ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH} 2>/dev/null
- mv ${TARGET_DIR}/usr/lib/* ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH}
+ -mv ${TARGET_DIR}/usr/lib/* ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH}
rm -rf ${TARGET_DIR}/usr/lib/
(cd ${TARGET_DIR}/usr ; ln -sf ${ADK_TARGET_LIBC_PATH} lib)
endif
@@ -71,7 +71,7 @@ ifeq ($(ADK_LINUX_PPC64),y)
rm -rf ${TARGET_DIR}/lib/
ln -sf /${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/lib
-mkdir ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH} 2>/dev/null
- mv ${TARGET_DIR}/usr/lib/* ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH}
+ -mv ${TARGET_DIR}/usr/lib/* ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH}
rm -rf ${TARGET_DIR}/usr/lib/
(cd ${TARGET_DIR}/usr ; ln -sf ${ADK_TARGET_LIBC_PATH} lib)
endif
@@ -81,7 +81,7 @@ ifeq ($(ADK_LINUX_SPARC64),y)
rm -rf ${TARGET_DIR}/lib/
ln -sf /${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/lib
-mkdir ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH} 2>/dev/null
- mv ${TARGET_DIR}/usr/lib/* ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH}
+ -mv ${TARGET_DIR}/usr/lib/* ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH}
rm -rf ${TARGET_DIR}/usr/lib/
(cd ${TARGET_DIR}/usr ; ln -sf ${ADK_TARGET_LIBC_PATH} lib)
endif
@@ -91,7 +91,7 @@ ifeq ($(ADK_TARGET_ABI_N32),y)
rm -rf ${TARGET_DIR}/lib/
ln -sf /${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/lib
-mkdir ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH} 2>/dev/null
- mv ${TARGET_DIR}/usr/lib/* ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH}
+ -mv ${TARGET_DIR}/usr/lib/* ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH}
rm -rf ${TARGET_DIR}/usr/lib/
(cd ${TARGET_DIR}/usr ; ln -sf ${ADK_TARGET_LIBC_PATH} lib)
endif
@@ -101,7 +101,7 @@ ifeq ($(ADK_TARGET_ABI_N64),y)
rm -rf ${TARGET_DIR}/lib/
ln -sf /${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/lib
-mkdir ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH} 2>/dev/null
- mv ${TARGET_DIR}/usr/lib/* ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH}
+ -mv ${TARGET_DIR}/usr/lib/* ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH}
rm -rf ${TARGET_DIR}/usr/lib/
(cd ${TARGET_DIR}/usr ; ln -sf ${ADK_TARGET_LIBC_PATH} lib)
endif
diff --git a/mk/rootfs.mk b/mk/rootfs.mk
index 3956306e9..dae0e5805 100644
--- a/mk/rootfs.mk
+++ b/mk/rootfs.mk
@@ -42,9 +42,6 @@ else
USB:= rootdelay=2
endif
-$(eval $(call rootfs_template,genext2fs,GENEXT2FS,$(ROOTFS)))
-$(eval $(call rootfs_template,cf,CF,$(ROOTFS)))
-$(eval $(call rootfs_template,mmc,MMC,$(ROOTFS)))
$(eval $(call rootfs_template,usb,USB,$(USB)))
$(eval $(call rootfs_template,archive,ARCHIVE,$(ROOTFS)))
$(eval $(call rootfs_template,initramfsarchive,INITRAMFSARCHIVE))
diff --git a/package/adk-helper/Makefile b/package/adk-helper/Makefile
index 7d0ccb202..d386bd508 100644
--- a/package/adk-helper/Makefile
+++ b/package/adk-helper/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_DESCR:= adk helper utilities
PKG_SECTION:= misc
-PKG_CFLINE_MKCRYPT:= depends on ADK_HOST_ONLY
+PKG_CFLINE_ADK_HELPER:= depends on ADK_HOST_ONLY
NO_DISTFILES:= 1
diff --git a/package/squashfs/Makefile b/package/squashfs/Makefile
index 575849acd..8478f6c57 100644
--- a/package/squashfs/Makefile
+++ b/package/squashfs/Makefile
@@ -8,6 +8,7 @@ PKG_VERSION:= 4.2
PKG_RELEASE:= 1
PKG_MD5SUM:= 1b7a781fb4cf8938842279bd3e8ee852
PKG_DESCR:= squashfs filesystem utilities
+HOST_BUILDDEP:= xz-host
PKG_SECTION:= fs
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=squashfs/}
diff --git a/target/arm/sys-available/acmesystems-foxg20 b/target/arm/sys-available/acmesystems-foxg20
index f3aded1d6..ac2ec191c 100644
--- a/target/arm/sys-available/acmesystems-foxg20
+++ b/target/arm/sys-available/acmesystems-foxg20
@@ -7,7 +7,6 @@ config ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
select ADK_acmesystems_foxg20
select ADK_KERNEL_AEABI
select ADK_TARGET_WITH_WATCHDOG
- select ADK_TARGET_WITH_MMC
select ADK_TARGET_WITH_RTC
select ADK_TARGET_WITH_USB
select ADK_TARGET_KERNEL_IMAGE
diff --git a/target/arm/sys-available/cubox-i b/target/arm/sys-available/cubox-i
index 8c87c9791..3b96514c8 100644
--- a/target/arm/sys-available/cubox-i
+++ b/target/arm/sys-available/cubox-i
@@ -7,7 +7,6 @@ config ADK_TARGET_SYSTEM_CUBOX_I
select ADK_fpu_neon
select ADK_cubox_i
select ADK_CPU_CORTEX_A9
- select ADK_TARGET_WITH_MMC
select ADK_TARGET_WITH_VGA
select ADK_TARGET_WITH_USB
select ADK_TARGET_WITH_INPUT
diff --git a/target/arm/sys-available/raspberry-pi b/target/arm/sys-available/raspberry-pi
index 472db927a..319df3523 100644
--- a/target/arm/sys-available/raspberry-pi
+++ b/target/arm/sys-available/raspberry-pi
@@ -7,7 +7,6 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI
select ADK_fpu_vfp
select ADK_raspberry_pi
select ADK_CPU_ARM1176JZF_S
- select ADK_TARGET_WITH_MMC
select ADK_TARGET_WITH_VGA
select ADK_TARGET_WITH_USB
select ADK_TARGET_WITH_INPUT
diff --git a/target/config/Config.in b/target/config/Config.in
index 498c5d9e4..1255ceae3 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -270,8 +270,6 @@ config ADK_TARGET_QEMU_WITH_BLOCK
select ADK_KERNEL_SCSI_IBMVSCSI if ADK_TARGET_SYSTEM_QEMU_PPC64
select ADK_KERNEL_SCSI_SUNESP if ADK_TARGET_SYSTEM_QEMU_SPARC
select ADK_KERNEL_PATA_PLATFORM if ADK_LINUX_SH
- select ADK_HOST_NEED_JFFS2 if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605 || ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800
- select ADK_HOST_NEED_SQUASHFS if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605 || ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800
endchoice
@@ -360,12 +358,6 @@ config ADK_TARGET_WITH_ACPI
config ADK_TARGET_WITH_VGA
boolean
-config ADK_TARGET_WITH_CF
- boolean
-
-config ADK_TARGET_WITH_MMC
- boolean
-
config ADK_TARGET_WITH_NAND
boolean
@@ -833,35 +825,6 @@ config ADK_TARGET_ROOTFS_USB
help
Boot system from USB stick.
-config ADK_TARGET_ROOTFS_CF
- bool "read-write filesystem for compact flash"
- depends on ADK_TARGET_WITH_CF
- select ADK_KERNEL_EXT2_FS
- select ADK_KERNEL_SCSI
- help
- Use this option if you have a compact flash based system.
- (ext2 filesystem is used.)
-
-config ADK_TARGET_ROOTFS_GENEXT2FS
- bool "read-write filesystem for compact flash (genext2fs version)"
- depends on ADK_TARGET_WITH_CF
- select ADK_KERNEL_EXT2_FS
- select ADK_KERNEL_SCSI
- select ADK_HOST_NEED_GENEXT2FS
- help
- Use this option if you have a compact flash based system.
- (ext2 filesystem is used.)
-
-config ADK_TARGET_ROOTFS_MMC
- bool "read-write filesystem for mmc/sdcard"
- depends on ADK_TARGET_WITH_MMC
- select ADK_KERNEL_EXT2_FS
- select ADK_KERNEL_SCSI
- depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
- help
- Use this option if you have a MMC/SDCARD based system.
- (ext2 filesystem is used.)
-
config ADK_TARGET_ROOTFS_ISO
bool "ISO image"
select ADK_KERNEL_ISO9660_FS
@@ -879,7 +842,7 @@ config ADK_TARGET_ROOTFS_ISO
config ADK_TARGET_ROOTFS_INITRAMFSARCHIVE
bool "Archive usable for initramfs creation"
help
- Use this option if your palnning to create a initramfs,
+ Use this option if your planning to create a initramfs,
useful for adk-test-framework.
config ADK_TARGET_ROOTFS_ARCHIVE
diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools
index 2159b4db7..95e4f6d63 100644
--- a/target/config/Config.in.tools
+++ b/target/config/Config.in.tools
@@ -106,16 +106,31 @@ config ADK_HOST_BUILD_SYSLINUX
default n
# optional, must be used from OpenADK
+config ADK_HOST_NEED_MTD_UTILS
+ boolean
+ default n
+
config ADK_HOST_BUILD_MTD_UTILS
boolean
+ default y if ADK_HOST_NEED_MTD_UTILS
+ default n
+
+config ADK_HOST_NEED_SQUASHFS
+ boolean
default n
config ADK_HOST_BUILD_SQUASHFS
boolean
+ default y if ADK_HOST_NEED_SQUASHFS
+ default n
+
+config ADK_HOST_NEED_MKIMAGE
+ boolean
default n
config ADK_HOST_BUILD_MKIMAGE
boolean
+ default y if ADK_HOST_NEED_MKIMAGE
default n
config ADK_HOST_BUILD_PCRE
diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs
index 3cb0517ac..5ebf38794 100644
--- a/target/linux/config/Config.in.fs
+++ b/target/linux/config/Config.in.fs
@@ -72,8 +72,6 @@ config ADK_KERNEL_SQUASHFS
config ADK_KERNEL_EXT2_FS
boolean
- default y if ADK_TARGET_WITH_CF
- default y if ADK_TARGET_WITH_MMC && !ADK_TARGET_SYSTEM_RASPBERRY_PI
default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
default n
@@ -196,7 +194,7 @@ config ADK_KPACKAGE_KMOD_VFAT_FS
select ADK_KPACKAGE_KMOD_NLS_CODEPAGE_850
select ADK_KPACKAGE_KMOD_NLS_ISO8859_1
select ADK_KERNEL_BLOCK
- default y if ADK_TARGET_WITH_MMC
+ default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
default n
help
This option provides support for normal Windows file systems with
diff --git a/target/mips/sys-available/mikrotik-rb532 b/target/mips/sys-available/mikrotik-rb532
index b787a3852..96ca4d46d 100644
--- a/target/mips/sys-available/mikrotik-rb532
+++ b/target/mips/sys-available/mikrotik-rb532
@@ -5,7 +5,6 @@ config ADK_TARGET_SYSTEM_MIKROTIK_RB532
select ADK_mikrotik_rb532
select ADK_TARGET_WITH_MINIPCI
select ADK_TARGET_WITH_WATCHDOG
- select ADK_TARGET_WITH_CF
select ADK_TARGET_WITH_NAND
select ADK_TARGET_WITH_LEDS
depends on ADK_BROKEN
diff --git a/target/sh/sys-available/toolchain-sh4 b/target/sh/sys-available/toolchain-sh4
new file mode 100644
index 000000000..4d7fff826
--- /dev/null
+++ b/target/sh/sys-available/toolchain-sh4
@@ -0,0 +1,11 @@
+config ADK_TARGET_SYSTEM_TOOLCHAIN_SH4
+ bool "Toolchain only (little endian)"
+ select ADK_sh
+ select ADK_little
+ select ADK_toolchain_sh
+ select ADK_CPU_SH4
+ select ADK_TOOLCHAIN
+ select ADK_TARGET_PACKAGE_TXZ
+ help
+ Build a superh toolchain (sh4).
+
diff --git a/target/sh/sys-available/toolchain-sh4eb b/target/sh/sys-available/toolchain-sh4eb
new file mode 100644
index 000000000..cccc163e1
--- /dev/null
+++ b/target/sh/sys-available/toolchain-sh4eb
@@ -0,0 +1,11 @@
+config ADK_TARGET_SYSTEM_TOOLCHAIN_SH4EB
+ bool "Toolchain only (big endian)"
+ select ADK_sh
+ select ADK_big
+ select ADK_toolchain_sheb
+ select ADK_CPU_SH4
+ select ADK_TOOLCHAIN
+ select ADK_TARGET_PACKAGE_TXZ
+ help
+ Build a superh toolchain (sh4 big endian).
+
diff --git a/target/x86/sys-available/ibm-x40 b/target/x86/sys-available/ibm-x40
index f55b1f622..80c5bf531 100644
--- a/target/x86/sys-available/ibm-x40
+++ b/target/x86/sys-available/ibm-x40
@@ -13,7 +13,6 @@ config ADK_TARGET_SYSTEM_IBM_X40
select ADK_TARGET_WITH_VGA
select ADK_TARGET_WITH_INPUT
select ADK_TARGET_WITH_RTC
- select ADK_TARGET_WITH_CF
select ADK_TARGET_WITH_MINIPCI
select ADK_TARGET_WITH_HDD
select ADK_TARGET_WITH_PCI
diff --git a/target/x86/sys-available/pcengines-alix1c b/target/x86/sys-available/pcengines-alix1c
index 902c004a1..484439328 100644
--- a/target/x86/sys-available/pcengines-alix1c
+++ b/target/x86/sys-available/pcengines-alix1c
@@ -14,7 +14,6 @@ config ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
select ADK_TARGET_WITH_VGA
select ADK_TARGET_WITH_INPUT
select ADK_TARGET_WITH_RTC
- select ADK_TARGET_WITH_CF
select ADK_TARGET_WITH_WATCHDOG
select ADK_TARGET_WITH_USB_BOOT
select ADK_TARGET_KERNEL_BZIMAGE
diff --git a/target/x86/sys-available/pcengines-alix2d13 b/target/x86/sys-available/pcengines-alix2d13
index c92c0d36e..33e939348 100644
--- a/target/x86/sys-available/pcengines-alix2d13
+++ b/target/x86/sys-available/pcengines-alix2d13
@@ -12,7 +12,6 @@ config ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
select ADK_TARGET_WITH_RTC
select ADK_TARGET_WITH_LEDS
select ADK_TARGET_WITH_WATCHDOG
- select ADK_TARGET_WITH_CF
select ADK_TARGET_KERNEL_BZIMAGE
depends on ADK_BROKEN
help
diff --git a/target/x86/sys-available/pcengines-alix2d2 b/target/x86/sys-available/pcengines-alix2d2
index fd83a700a..a48bec2cc 100644
--- a/target/x86/sys-available/pcengines-alix2d2
+++ b/target/x86/sys-available/pcengines-alix2d2
@@ -12,7 +12,6 @@ config ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
select ADK_TARGET_WITH_USB
select ADK_TARGET_WITH_LEDS
select ADK_TARGET_WITH_WATCHDOG
- select ADK_TARGET_WITH_CF
select ADK_TARGET_KERNEL_BZIMAGE
depends on ADK_BROKEN
help
diff --git a/target/x86/sys-available/pcengines-wrap b/target/x86/sys-available/pcengines-wrap
index 2fa4e13c4..50db08ccf 100644
--- a/target/x86/sys-available/pcengines-wrap
+++ b/target/x86/sys-available/pcengines-wrap
@@ -4,7 +4,6 @@ config ADK_TARGET_SYSTEM_PCENGINES_WRAP
select ADK_pcengines_wrap
select ADK_CPU_I486
select ADK_KERNEL_I486
- select ADK_TARGET_WITH_CF
select ADK_TARGET_WITH_MINIPCI
select ADK_TARGET_WITH_WATCHDOG
select ADK_TARGET_KERNEL_BZIMAGE
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 16:29:23 +0000