summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-04-02 07:38:42 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-04-02 07:38:42 +0200
commit21cd6362a0d333d22b6ad23c0b7b830ec079b14f (patch)
tree995cf35de6102d72d860920123859218603538e7
parent98a4d7f53119697858540612e7ef86ea6732b8c3 (diff)
parent309f13ab6858e1c1639814e210a6c86380ca717b (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
-rw-r--r--mk/rootfs.mk3
-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.in37
-rw-r--r--target/linux/config/Config.in.fs4
-rw-r--r--target/mips/sys-available/mikrotik-rb5321
-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
12 files changed, 2 insertions, 51 deletions
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/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 333664aea..1255ceae3 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -358,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
@@ -831,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
@@ -877,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/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/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