summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDennis Gilmore <dennis@ausil.us>2011-08-12 00:37:40 -0500
committerDennis Gilmore <dennis@ausil.us>2011-08-16 11:34:23 -0500
commit3e616b4b287d4859d0de712676c5bbc74d996036 (patch)
tree3b47cca6e09fbfa828392788570a43219100695b
parent41dc1eca4d338b45ca71f210d8a874f2820d265a (diff)
downloadkernel-3e616b4b287d4859d0de712676c5bbc74d996036.tar.gz
kernel-3e616b4b287d4859d0de712676c5bbc74d996036.tar.xz
kernel-3e616b4b287d4859d0de712676c5bbc74d996036.zip
tweak the arm configs a little
build a up image on armv5tel its a basic qemu image. setup to make configs for building kernels on hardware floating point arm arches
-rw-r--r--Makefile.config13
-rw-r--r--config-arm-generic5
-rw-r--r--config-arm-tegra18
-rw-r--r--kernel.spec3
4 files changed, 36 insertions, 3 deletions
diff --git a/Makefile.config b/Makefile.config
index 7415c9155..ccb035d77 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -9,7 +9,9 @@ CONFIGFILES = \
$(CFG)-i686-PAE.config $(CFG)-i686-PAEdebug.config \
$(CFG)-x86_64.config $(CFG)-x86_64-debug.config \
$(CFG)-s390x.config \
- $(CFG)-arm.config $(CFG)-armv7l-omap.config $(CFG)-armv7l-tegra.config \
+ $(CFG)-arm.config $(CFG)-armv5tel.config \
+ $(CFG)-armv7l-omap.config $(CFG)-armv7l-tegra.config \
+ $(CFG)-armv7hl-omap.config $(CFG)-armv7hl-tegra.config \
$(CFG)-ppc.config $(CFG)-ppc-smp.config \
$(CFG)-sparc64.config \
$(CFG)-ppc64.config $(CFG)-ppc64-debug.config \
@@ -111,12 +113,21 @@ kernel-$(VERSION)-s390x.config: config-s390x temp-s390-generic
kernel-$(VERSION)-arm.config: /dev/null temp-arm-generic
perl merge.pl $^ arm > $@
+kernel-$(VERSION)-armv5tel.config: /dev/null temp-arm-generic
+ perl merge.pl $^ arm > $@
+
kernel-$(VERSION)-armv7l-omap.config: /dev/null temp-armv7l-omap-generic
perl merge.pl $^ arm > $@
kernel-$(VERSION)-armv7l-tegra.config: /dev/null temp-armv7l-tegra
perl merge.pl $^ arm > $@
+kernel-$(VERSION)-armv7hl-omap.config: /dev/null temp-armv7l-omap-generic
+ perl merge.pl $^ arm > $@
+
+kernel-$(VERSION)-armv7hl-tegra.config: /dev/null temp-armv7l-tegra
+ perl merge.pl $^ arm > $@
+
kernel-$(VERSION)-ppc.config: /dev/null temp-powerpc32-generic
perl merge.pl $^ powerpc > $@
diff --git a/config-arm-generic b/config-arm-generic
index dec424128..3d236b807 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -83,9 +83,12 @@ CONFIG_FB_ARMCLCD=m
CONFIG_SND_ARM=y
CONFIG_SND_ARMAACI=m
+CONFIG_SND_SOC=m
+# CONFIG_SND_SOC_CACHE_LZO is not set
+# CONFIG_SND_SOC_ALL_CODECS is not set
CONFIG_USB_MUSB_HDRC=y
-# CONFIG_MUSB_PIO_ONLY is not set
+CONFIG_MUSB_PIO_ONLY=y
CONFIG_USB_TUSB6010=y
# CONFIG_USB_MUSB_DEBUG is not set
diff --git a/config-arm-tegra b/config-arm-tegra
index 31d89b3b2..15e9ed720 100644
--- a/config-arm-tegra
+++ b/config-arm-tegra
@@ -49,6 +49,11 @@ CONFIG_KEYBOARD_TEGRA=y
# CONFIG_MPCORE_WATCHDOG is not set
CONFIG_USB_EHCI_TEGRA=y
CONFIG_RTC_DRV_TEGRA=m
+
+CONFIG_SND_SOC_TEGRA=m
+CONFIG_SND_SOC_TEGRA_WM8903=m
+CONFIG_SND_SOC_TEGRA_TRIMSLICE=m
+
CONFIG_MFD_NVEC=y
# CONFIG_DEBUG_PREEMPT is not set
# CONFIG_RCU_CPU_STALL_VERBOSE is not set
@@ -56,6 +61,7 @@ CONFIG_MFD_NVEC=y
CONFIG_KEYBOARD_NVEC=y
CONFIG_SERIO_NVEC_PS2=y
CONFIG_NVEC_POWER=y
+CONFIG_POWER_SUPPLY=y
CONFIG_CPU_FREQ=y
CONFIG_CPU_FREQ_DEBUG=y
@@ -67,5 +73,15 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=m
CONFIG_CPU_FREQ_GOV_ONDEMAND=m
CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
CONFIG_CPU_FREQ_TABLE=y
-CONFIG_CPU_FREQ_STAT=m
+CONFIG_CPU_FREQ_STAT=y
CONFIG_CPU_FREQ_STAT_DETAILS=y
+
+
+# these modules all fail with missing __bad_udelay
+# http://www.spinics.net/lists/arm/msg15615.html provides some background
+# CONFIG_SUNGEM is not set
+# CONFIG_FB_SAVAGE is not set
+# CONFIG_FB_RADEON is not set
+# CONFIG_DRM_RADEON is not set
+# CONFIG_ATM_HE is not set
+# CONFIG_SCSI_ACARD is not set
diff --git a/kernel.spec b/kernel.spec
index 4641e4c49..8066c16ba 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -395,7 +395,10 @@ Summary: The Linux kernel
%define hdrarch arm
%define make_target bzImage
%define kernel_image arch/arm/boot/zImage
+# we build a up kernel on armv5tel. its used for qemu.
+%ifnarch armv5tel
%define with_up 0
+%endif
# we only build headers on the base arm arches
# just like we used to only build them on i386 for x86
%ifnarch armv5tel armv7hl