Browse Source

more kernel config cleanups

Waldemar Brodkorb 8 years ago
parent
commit
8f38a3b636

+ 1 - 1
target/Makefile

@@ -27,7 +27,7 @@ ADK_PACKAGE_CMDLINE:=root=$(ADK_PACKAGE_CRYPTINIT_ROOT) swap=$(ADK_PACKAGE_CRYPT
 
 ifeq ($(ADK_TARGET_KERNEL_CUSTOMISING),y)
 config-prepare: $(ADK_TOPDIR)/.config
-	@PATH='$(HOST_PATH)' sed -n '/^ADK_KERNEL/s//CONFIG/p' $(ADK_TOPDIR)/.config \
+	@PATH='$(HOST_PATH)' sed -n '/^ADK_KERNEL/s//CONFIG/p' $(ADK_TOPDIR)/.config | grep -v CONFIG_VERSION \
 	    >$(BUILD_DIR)/.kernelconfig.kernel
 	@if [ -f $(ADK_TARGET_ARCH)/kernel/$(ADK_TARGET_KERNEL_MINICONFIG) ];then \
 		cat $(ADK_TOPDIR)/target/linux/kernel.config \

+ 1 - 0
target/arm/kernel/raspberry-pi

@@ -9,6 +9,7 @@ CONFIG_ARCH_BCM2708=y
 CONFIG_MACH_BCM2708=y
 CONFIG_BCM2708_VCMEM=y
 CONFIG_BCM2708_DMAER=y
+CONFIG_RASPBERRYPI_FIRMWARE=y
 CONFIG_BCM2708_VCHIQ=y
 CONFIG_BCM2708_DT=y
 CONFIG_SERIAL_AMBA_PL011=y

+ 6 - 1
target/arm/kernel/raspberry-pi2

@@ -5,8 +5,13 @@ CONFIG_PHYS_OFFSET=0
 CONFIG_HAVE_ARM_ARCH_TIMER=y
 CONFIG_FIQ=y
 CONFIG_ATAGS=y
-CONFIG_ATAGS_PROC=y
 CONFIG_KUSER_HELPERS=y
+CONFIG_RASPBERRYPI_FIRMWARE=y
+CONFIG_BCM2708_VCHIQ=y
+CONFIG_MAILBOX=y
+CONFIG_BCM2835_MBOX=y
+CONFIG_OF=y
+CONFIG_OF_OVERLAY=y
 CONFIG_SERIAL_AMBA_PL011=y
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
 CONFIG_CMDLINE_FROM_BOOTLOADER=y

+ 2 - 6
target/linux/config/Config.in.kernel

@@ -194,6 +194,7 @@ config ADK_KERNEL_DEVTMPFS_MOUNT
 config ADK_KERNEL_UEVENT_HELPER
 	bool
 	depends on ADK_RUNTIME_DEV_MDEV
+	default y if ADK_RUNTIME_DEV_MDEV
 
 config ADK_KERNEL_UEVENT_HELPER_PATH
 	string
@@ -214,12 +215,7 @@ config ADK_KERNEL_VFP
 config ADK_KERNEL_VFPv3
 	bool
 	select ADK_KERNEL_VFP
-	default y if ADK_TARGET_CPU_WITH_FPU_VFPV3
-
-config ADK_KERNEL_VFPv4
-	bool
-	select ADK_KERNEL_VFP
-	default y if ADK_TARGET_CPU_WITH_FPU_VFPV4
+	default y if ADK_TARGET_CPU_WITH_FPU_VFPV3 || ADK_TARGET_CPU_WITH_FPU_VFPV4
 
 config ADK_KERNEL_NEON
 	bool