summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-03-06 12:27:17 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-03-06 12:27:17 +0100
commit7f853c20b539d4b71e6d0ef53fcc16d7b9c00976 (patch)
tree741b4dec89a982349c3c632e0c57ebc9a1461deb /target
parent448a4dad384ca81784f7fa65d7f708ecae1a02a6 (diff)
parent0e0a2444db5dd41d5cec523ce183ace747fcfc74 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target')
-rw-r--r--target/Makefile8
-rw-r--r--target/config/Config.in7
-rw-r--r--target/config/Config.in.arch.choice10
-rw-r--r--target/linux/Config.in1
-rw-r--r--target/linux/config/Config.in.audio2
-rw-r--r--target/linux/config/Config.in.block3
-rw-r--r--target/linux/config/Config.in.graphics7
-rw-r--r--target/linux/config/Config.in.input10
-rw-r--r--target/linux/config/Config.in.misc4
-rw-r--r--target/linux/config/Config.in.netdevice1
-rw-r--r--target/linux/config/Config.in.pm13
-rw-r--r--target/linux/config/Config.in.sched1
-rw-r--r--target/linux/config/Config.in.serial9
-rw-r--r--target/linux/config/Config.in.usb15
-rw-r--r--target/x86/sys-available/intel-atom29
15 files changed, 2 insertions, 118 deletions
diff --git a/target/Makefile b/target/Makefile
index 562d2b86b..fc3fd77f6 100644
--- a/target/Makefile
+++ b/target/Makefile
@@ -52,13 +52,6 @@ config-prepare: $(TOPDIR)/.config
>${BUILD_DIR}/.kernelconfig.kernel
@sed -n '/^# ADK_KERNEL/s//# CONFIG/p' ${TOPDIR}/.config \
>${BUILD_DIR}/.kernelconfig.nokernel
-ifeq ($(ADK_NATIVE),y)
- @if [ -f /etc/adktarget ];then \
- cp $(TOPDIR)/target/$(ARCH)/${KERNEL_CFG} ${BUILD_DIR}/.kernelconfig.board; \
- else \
- if [ -f /proc/config.gz ];then zcat /proc/config.gz > ${BUILD_DIR}/.kernelconfig.board; else cp ${ADK_TARGET}/kernel.config.$(ARCH) ${BUILD_DIR}/.kernelconfig.board; fi; \
- fi
-else
ifeq ($(ADK_USE_KERNEL_MINICONFIG),y)
@if [ -f ${ADK_TARGET_ARCH}/kernel/${ADK_TARGET_KERNEL_MINICONFIG} ];then \
cat ${TOPDIR}/target/linux/kernel.config \
@@ -74,7 +67,6 @@ else
cp ${ADK_TARGET_ARCH}/${KERNEL_CFG} ${BUILD_DIR}/.kernelconfig.board; \
fi
endif
-endif
@(cat ${BUILD_DIR}/.kernelconfig.{modules,kernel} | \
while IFS='=' read symbol value; do \
sed -i -e "/^# $$symbol/d" ${BUILD_DIR}/.kernelconfig.board; \
diff --git a/target/config/Config.in b/target/config/Config.in
index be008f97e..0eab0aecf 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -336,10 +336,6 @@ config ADK_TARGET_BROADCOM_MODEL_ASUS_WL500GP
endchoice
-if ADK_LINUX_NATIVE
-source "target/config/Config.in.native"
-endif
-
# hardware features
config ADK_TARGET_WITH_USB
boolean
@@ -432,9 +428,6 @@ config ADK_HARDWARE_QEMU
config ADK_HARDWARE_VBOX
boolean
-config ADK_NATIVE
- boolean
-
# the inverse of ADK_TARGET_KERNEL_CUSTOMISING,
# allows for selecting it off (i.e., to disable it)
config ADK_TARGET_FIXED_KERNEL
diff --git a/target/config/Config.in.arch.choice b/target/config/Config.in.arch.choice
index a147a0251..c2fc7f2f3 100644
--- a/target/config/Config.in.arch.choice
+++ b/target/config/Config.in.arch.choice
@@ -4,16 +4,6 @@ prompt "Target architecture"
config ADK_CHOOSE_TARGET_ARCH
bool "Choose target architecture"
-config ADK_LINUX_NATIVE
- bool "native build"
- select ADK_native
- select ADK_NATIVE
- select ADK_TARGET_LIB_LIBC
- depends on ADK_HOST_LINUX
- help
- Make a native build. Use host tools.
- No toolchain will be created.
-
config ADK_LINUX_ARM
bool "arm system"
select ADK_arm
diff --git a/target/linux/Config.in b/target/linux/Config.in
index 739e2008c..9c1c04b85 100644
--- a/target/linux/Config.in
+++ b/target/linux/Config.in
@@ -19,7 +19,6 @@ source target/linux/config/Config.in.misc
source target/linux/config/Config.in.mips
source target/linux/config/Config.in.lib
source target/linux/config/Config.in.pm
-source target/linux/config/Config.in.serial
source target/linux/config/Config.in.spi
source target/linux/config/Config.in.kvm
source target/linux/config/Config.in.debug
diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio
index dc2ff100f..76c353f0c 100644
--- a/target/linux/config/Config.in.audio
+++ b/target/linux/config/Config.in.audio
@@ -60,7 +60,6 @@ config ADK_KPACKAGE_KMOD_SND_OSSEMUL
select ADK_KERNEL_SND_PCM_OSS
select ADK_KPACKAGE_KMOD_SND
default y if ADK_TARGET_SYSTEM_IBM_X40
- default y if ADK_NATIVE_SYSTEM_IBM_X40
default n
help
ALSA OSS Emulation
@@ -71,7 +70,6 @@ config ADK_KPACKAGE_KMOD_SND_INTEL8X0
select ADK_KPACKAGE_KMOD_SND_AC97_CODEC
select ADK_KPACKAGE_KMOD_SND
default y if ADK_TARGET_SYSTEM_IBM_X40
- default y if ADK_NATIVE_SYSTEM_IBM_X40
default n
depends on ADK_TARGET_WITH_PCI
help
diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block
index 057556afd..9297031c2 100644
--- a/target/linux/config/Config.in.block
+++ b/target/linux/config/Config.in.block
@@ -177,7 +177,6 @@ config ADK_KERNEL_SATA_AHCI
select ADK_KERNEL_BLK_DEV
select ADK_KERNEL_BLK_DEV_SD
depends on ADK_TARGET_WITH_SATA
- default y if ADK_TARGET_SYSTEM_SHUTTLE_SA76
default y if ADK_TARGET_SYSTEM_VBOX_I686
default n
@@ -191,8 +190,6 @@ config ADK_KPACKAGE_KMOD_SATA_AHCI
select ADK_KERNEL_BLK_DEV_SD
depends on !ADK_KERNEL_SATA_AHCI
depends on ADK_TARGET_WITH_SATA
- default y if ADK_TARGET_SYSTEM_INTEL_ATOM
- default y if ADK_NATIVE_SYSTEM_INTEL_ATOM
default n
help
Enables support for AHCI Serial ATA.
diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics
index 477541478..dc748e6c0 100644
--- a/target/linux/config/Config.in.graphics
+++ b/target/linux/config/Config.in.graphics
@@ -2,16 +2,12 @@ config ADK_KERNEL_VT
boolean
default y if ADK_HARDWARE_VBOX
default y if ADK_TARGET_WITH_VGA
- default y if ADK_NATIVE_SYSTEM_IBM_X40
- default y if ADK_NATIVE_SYSTEM_INTEL_ATOM
default n
config ADK_KERNEL_VT_CONSOLE
boolean
default y if ADK_HARDWARE_VBOX
default y if ADK_TARGET_WITH_VGA
- default y if ADK_NATIVE_SYSTEM_IBM_X40
- default y if ADK_NATIVE_SYSTEM_INTEL_ATOM
default n
config ADK_KERNEL_VGA_CONSOLE
@@ -143,9 +139,8 @@ config ADK_HARDWARE_GRAPHICS_INTEL_I915
select ADK_KERNEL_DRM_I915_KMS
select ADK_KERNEL_DRM_I915
default y if ADK_TARGET_SYSTEM_IBM_X40
- default y if ADK_NATIVE_SYSTEM_IBM_X40
default n
- depends on ADK_TARGET_SYSTEM_IBM_X40 || ADK_NATIVE_SYSTEM_IBM_X40 || ADK_TARGET_SYSTEM_INTEL_ATOM || ADK_NATIVE_SYSTEM_INTEL_ATOM
+ depends on ADK_TARGET_SYSTEM_IBM_X40
help
AGP/DRM/KMS support for Intel chipset i915.
diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input
index 939354881..17c23b65c 100644
--- a/target/linux/config/Config.in.input
+++ b/target/linux/config/Config.in.input
@@ -4,9 +4,7 @@ config ADK_KERNEL_INPUT
default y if ADK_TARGET_SYSTEM_VBOX_I686
default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
default y if ADK_TARGET_SYSTEM_IBM_X40
- default y if ADK_NATIVE_SYSTEM_IBM_X40
default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
- default y if ADK_NATIVE_SYSTEM_LEMOTE_YEELONG
default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
default n
@@ -61,9 +59,7 @@ config ADK_KERNEL_INPUT_KEYBOARD
default y if ADK_TARGET_SYSTEM_VBOX_I686
default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
default y if ADK_TARGET_SYSTEM_IBM_X40
- default y if ADK_NATIVE_SYSTEM_IBM_X40
default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
- default y if ADK_NATIVE_SYSTEM_LEMOTE_YEELONG
default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
default n
@@ -73,9 +69,7 @@ config ADK_KERNEL_KEYBOARD_ATKBD
default y if ADK_TARGET_SYSTEM_VBOX_I686
default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
default y if ADK_TARGET_SYSTEM_IBM_X40
- default y if ADK_NATIVE_SYSTEM_IBM_X40
default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
- default y if ADK_NATIVE_SYSTEM_LEMOTE_YEELONG
default n
config ADK_KERNEL_INPUT_MOUSE
@@ -84,9 +78,7 @@ config ADK_KERNEL_INPUT_MOUSE
default y if ADK_TARGET_SYSTEM_VBOX_I686
default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
default y if ADK_TARGET_SYSTEM_IBM_X40
- default y if ADK_NATIVE_SYSTEM_IBM_X40
default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
- default y if ADK_NATIVE_SYSTEM_LEMOTE_YEELONG
default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
default n
@@ -96,9 +88,7 @@ config ADK_KERNEL_INPUT_MOUSEDEV
default y if ADK_TARGET_SYSTEM_VBOX_I686
default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
default y if ADK_TARGET_SYSTEM_IBM_X40
- default y if ADK_NATIVE_SYSTEM_IBM_X40
default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
- default y if ADK_NATIVE_SYSTEM_LEMOTE_YEELONG
default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
default n
diff --git a/target/linux/config/Config.in.misc b/target/linux/config/Config.in.misc
index ea9bc5e5a..64eb8d38b 100644
--- a/target/linux/config/Config.in.misc
+++ b/target/linux/config/Config.in.misc
@@ -57,11 +57,9 @@ config ADK_KERNEL_RTC_DRV_CMOS
default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
default y if ADK_TARGET_SYSTEM_IBM_X40
- default y if ADK_NATIVE_SYSTEM_IBM_X40
- default y if ADK_NATIVE_SYSTEM_LEMOTE_YEELONG
default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
default n
- depends on (ADK_TARGET_SYSTEM_PCENGINES_ALIX1C || ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 || ADK_TARGET_SYSTEM_IBM_X40 || ADK_NATIVE_SYSTEM_IBM_X40 || ADK_NATIVE_SYSTEM_LEMOTE_YEELONG || ADK_TARGET_SYSTEM_LEMOTE_YEELONG)
+ depends on (ADK_TARGET_SYSTEM_PCENGINES_ALIX1C || ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 || ADK_TARGET_SYSTEM_IBM_X40 || ADK_TARGET_SYSTEM_LEMOTE_YEELONG)
help
PC CMOS RTC support.
diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice
index 001ecfd33..789b75b7d 100644
--- a/target/linux/config/Config.in.netdevice
+++ b/target/linux/config/Config.in.netdevice
@@ -357,7 +357,6 @@ config ADK_KPACKAGE_KMOD_ATH5K
select ADK_KPACKAGE_KMOD_MAC80211
depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_AHB
default y if ADK_TARGET_SYSTEM_IBM_X40
- default y if ADK_NATIVE_SYSTEM_IBM_X40
default y if ADK_TARGET_SYSTEM_FON_FON2100
default n
help
diff --git a/target/linux/config/Config.in.pm b/target/linux/config/Config.in.pm
index d93c820cc..deff5b3f6 100644
--- a/target/linux/config/Config.in.pm
+++ b/target/linux/config/Config.in.pm
@@ -36,12 +36,7 @@ config ADK_HARDWARE_ACPI
select ADK_KERNEL_ACPI_BUTTON
select ADK_KERNEL_ACPI_FAN
select ADK_KERNEL_ACPI_DOCK
- default y if ADK_TARGET_SYSTEM_INTEL_ATOM
- default y if ADK_NATIVE_SYSTEM_INTEL_ATOM
default y if ADK_TARGET_SYSTEM_IBM_X40
- default y if ADK_NATIVE_SYSTEM_IBM_X40
- default y if ADK_TARGET_SYSTEM_TAROX_PC
- default y if ADK_NATIVE_SYSTEM_TAROX_PC
default n
help
Enable ACPI support.
@@ -50,12 +45,8 @@ config ADK_KERNEL_SUSPEND
prompt "Enable Suspend-to-RAM support"
boolean
select ADK_KERNEL_PM
- default y if ADK_TARGET_SYSTEM_INTEL_ATOM
- default y if ADK_NATIVE_SYSTEM_INTEL_ATOM
default y if ADK_TARGET_SYSTEM_IBM_X40
- default y if ADK_NATIVE_SYSTEM_IBM_X40
default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
- default y if ADK_NATIVE_SYSTEM_LEMOTE_YEELONG
default n
help
Enable Suspend-to-RAM support.
@@ -66,12 +57,8 @@ config ADK_KERNEL_HIBERNATION
select ADK_KERNEL_PM
select ADK_KERNEL_SWAP
select BUSYBOX_SWAPONOFF
- default y if ADK_TARGET_SYSTEM_INTEL_ATOM
- default y if ADK_NATIVE_SYSTEM_INTEL_ATOM
default y if ADK_TARGET_SYSTEM_IBM_X40
- default y if ADK_NATIVE_SYSTEM_IBM_X40
default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
- default y if ADK_NATIVE_SYSTEM_LEMOTE_YEELONG
default n
help
Enable Suspend-to-Disk support.
diff --git a/target/linux/config/Config.in.sched b/target/linux/config/Config.in.sched
index 7cea06102..2e749a5fb 100644
--- a/target/linux/config/Config.in.sched
+++ b/target/linux/config/Config.in.sched
@@ -17,7 +17,6 @@ config ADK_KERNEL_NET_ESTIMATOR
default n
config ADK_KERNEL_NET_SCHED
- #prompt "kmod-net-sched.................... QoS and/or fair queueing support"
boolean
default n
help
diff --git a/target/linux/config/Config.in.serial b/target/linux/config/Config.in.serial
deleted file mode 100644
index 6ba3d4872..000000000
--- a/target/linux/config/Config.in.serial
+++ /dev/null
@@ -1,9 +0,0 @@
-config ADK_KERNEL_SERIAL_PXA
- boolean
- default y if ADK_TARGET_QEMU_ARM_MODEL_SPITZ
- default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
-
-config ADK_KERNEL_SERIAL_PXA_CONSOLE
- boolean
- default y if ADK_TARGET_QEMU_ARM_MODEL_SPITZ
- default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb
index e1fd3c0c3..b2c750673 100644
--- a/target/linux/config/Config.in.usb
+++ b/target/linux/config/Config.in.usb
@@ -41,12 +41,7 @@ config ADK_KPACKAGE_KMOD_USB
default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
- default y if ADK_TARGET_SYSTEM_TAROX_PC
- default y if ADK_NATIVE_SYSTEM_TAROX_PC
default y if ADK_TARGET_SYSTEM_IBM_X40
- default y if ADK_NATIVE_SYSTEM_IBM_X40
- default y if ADK_TARGET_SYSTEM_INTEL_ATOM
- default y if ADK_NATIVE_SYSTEM_INTEL_ATOM
default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
default n
@@ -88,9 +83,6 @@ config ADK_KPACKAGE_KMOD_USB_UHCI_HCD
depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
default y if ADK_TARGET_SYSTEM_IBM_X40
- default y if ADK_NATIVE_SYSTEM_IBM_X40
- default y if ADK_TARGET_SYSTEM_INTEL_ATOM
- default y if ADK_NATIVE_SYSTEM_INTEL_ATOM
default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
default n
help
@@ -114,8 +106,6 @@ config ADK_KPACKAGE_KMOD_USB_OHCI_HCD
default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
- default y if ADK_TARGET_SYSTEM_INTEL_ATOM
- default y if ADK_NATIVE_SYSTEM_INTEL_ATOM
default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
default y if ADK_TARGET_SYSTEM_QEMU_SH4
default n
@@ -179,12 +169,7 @@ config ADK_KPACKAGE_KMOD_USB_EHCI_HCD
default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
- default y if ADK_TARGET_SYSTEM_INTEL_ATOM
- default y if ADK_NATIVE_SYSTEM_INTEL_ATOM
default y if ADK_TARGET_SYSTEM_IBM_X40
- default y if ADK_NATIVE_SYSTEM_IBM_X40
- default y if ADK_TARGET_SYSTEM_TAROX_PC
- default y if ADK_NATIVE_SYSTEM_TAROX_PC
default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
default n
help
diff --git a/target/x86/sys-available/intel-atom b/target/x86/sys-available/intel-atom
deleted file mode 100644
index 86bc85cd1..000000000
--- a/target/x86/sys-available/intel-atom
+++ /dev/null
@@ -1,29 +0,0 @@
-config ADK_TARGET_SYSTEM_INTEL_ATOM
- bool "Intel Atom (NM10)"
- depends on ADK_BROKEN
- select ADK_x86
- select ADK_intel_atom
- select ADK_CPU_ATOM
- select ADK_KERNEL_MATOM
- select ADK_KERNEL_MII
- select ADK_TARGET_CPU_WITH_MMX
- select ADK_TARGET_CPU_WITH_SSE
- select ADK_TARGET_CPU_WITH_SSE2
- select ADK_TARGET_CPU_WITH_SSE3
- select ADK_TARGET_CPU_WITH_SSSE3
- select ADK_TARGET_CPU_WITH_HT
- select ADK_TARGET_CPU_WITH_MTRR
- select ADK_TARGET_WITH_USB_BOOT
- select ADK_TARGET_WITH_USB
- select ADK_TARGET_WITH_VGA
- select ADK_TARGET_WITH_INPUT
- select ADK_TARGET_WITH_RTC
- select ADK_TARGET_WITH_CF
- select ADK_TARGET_WITH_INPUT
- select ADK_TARGET_WITH_HDD
- select ADK_TARGET_WITH_PCI
- select ADK_TARGET_WITH_ACPI
- select ADK_TARGET_WITH_SATA
- help
- System profile for Intel Atom.
-