summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2009-11-22 19:32:17 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2009-11-22 19:32:17 +0100
commit2ba5a8bb9f383740ab503b79445da1e924665c51 (patch)
treeaa9e4b9ea12dcad8e2a386630343e1dd9a6c7783
parent4088c6eaebb868c4533c83a3d7880b9fab31d45e (diff)
fix compact flash support for wrap
-rw-r--r--Makefile4
-rw-r--r--mk/build.mk5
-rw-r--r--target/Config.in4
-rw-r--r--target/wrap/kernel.config11
-rw-r--r--target/wrap/patches/fix-pata-sc1200.patch12
5 files changed, 27 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index 9c2ef0777..b4e4a9045 100644
--- a/Makefile
+++ b/Makefile
@@ -37,6 +37,7 @@ help:
@echo ' allmodconfig - New config selecting all packages as modules when possible'
@echo ' allconfig - New config selecting all packages when possible'
@echo ' allnoconfig - New config where all options are answered with no'
+ @echo ' kernelconfig - Modify the target kernel configuration'
@echo ''
@echo 'Help targets:'
@echo ' help - Print this help text'
@@ -113,6 +114,9 @@ image: .prereq_done
switch: .prereq_done
@${GMAKE_INV} switch
+kernelconfig: .prereq_done
+ @${GMAKE_INV} kernelconfig
+
image_clean imageclean cleanimage: .prereq_done
@${GMAKE_INV} image_clean
diff --git a/mk/build.mk b/mk/build.mk
index f38616f52..fbb52c0bb 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -122,6 +122,11 @@ switch:
echo "Setting configuration to target: ${TARGET}"; \
else echo "No old target config found";mv .config .config.bak; make TARGET=${TARGET};fi
+kernelconfig:
+ cp $(TOPDIR)/target/$(ADK_TARGET)/kernel.config $(BUILD_DIR)/linux/.config
+ make -C $(BUILD_DIR)/linux/ ARCH=$(ARCH) menuconfig
+ cp $(BUILD_DIR)/linux/.config $(TOPDIR)/target/$(ADK_TARGET)/kernel.config
+
#############################################################
#
# Cleanup and misc junk
diff --git a/target/Config.in b/target/Config.in
index 94d98cd25..8b32b4f4a 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -138,6 +138,7 @@ config ADK_LINUX_X86_ALIX1C
select ADK_alix1c
select ADK_KERNEL_SCSI
select ADK_KERNEL_ATA
+ select ADK_KERNEL_BLK_DEV_SD
select ADK_KERNEL_EXT2_FS
select ADK_KERNEL_NET_PCI
select ADK_KERNEL_NETDEVICES
@@ -153,6 +154,7 @@ config ADK_LINUX_X86_WRAP
select ADK_wrap
select ADK_KERNEL_SCSI
select ADK_KERNEL_ATA
+ select ADK_KERNEL_BLK_DEV_SD
select ADK_KERNEL_EXT2_FS
select ADK_KERNEL_NET_PCI
select ADK_KERNEL_NETDEVICES
@@ -394,6 +396,7 @@ config ADK_LINUX_MIPS_RB532
select ADK_KERNEL_NET_PCI
select ADK_KERNEL_NET_ETHERNET
select ADK_KERNEL_MII
+ select ADK_KERNEL_BLK_DEV_SD
help
Support for Mikrotik RB532.
endchoice
@@ -551,7 +554,6 @@ config ADK_TARGET_ROOTFS_EXT2_CF
ADK_LINUX_MIPS_RB532
select ADK_KERNEL_EXT2_FS
select ADK_KERNEL_SCSI
- select ADK_KERNEL_BLK_DEV_SD
help
Use this option if you have a compact flash reader
inside your hardware and want to boot from it.
diff --git a/target/wrap/kernel.config b/target/wrap/kernel.config
index b251afbc7..51c8272c9 100644
--- a/target/wrap/kernel.config
+++ b/target/wrap/kernel.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.31.5
-# Sun Nov 22 18:11:22 2009
+# Sun Nov 22 19:32:12 2009
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -304,11 +304,6 @@ CONFIG_CMDLINE="console=ttyS0,38400"
# CPU Frequency scaling
#
# CONFIG_CPU_FREQ is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
# CONFIG_CPU_IDLE is not set
#
@@ -500,7 +495,7 @@ CONFIG_ATA_SFF=y
# CONFIG_SATA_VITESSE is not set
# CONFIG_SATA_INIC162X is not set
# CONFIG_PATA_ALI is not set
-CONFIG_PATA_AMD=y
+# CONFIG_PATA_AMD is not set
# CONFIG_PATA_ARTOP is not set
# CONFIG_PATA_ATIIXP is not set
# CONFIG_PATA_CMD640_PCI is not set
@@ -532,7 +527,7 @@ CONFIG_PATA_AMD=y
# CONFIG_PATA_PDC_OLD is not set
# CONFIG_PATA_RADISYS is not set
# CONFIG_PATA_RZ1000 is not set
-# CONFIG_PATA_SC1200 is not set
+CONFIG_PATA_SC1200=y
# CONFIG_PATA_SERVERWORKS is not set
# CONFIG_PATA_PDC2027X is not set
# CONFIG_PATA_SIL680 is not set
diff --git a/target/wrap/patches/fix-pata-sc1200.patch b/target/wrap/patches/fix-pata-sc1200.patch
new file mode 100644
index 000000000..c3d3ce527
--- /dev/null
+++ b/target/wrap/patches/fix-pata-sc1200.patch
@@ -0,0 +1,12 @@
+diff -Nur linux-2.6.31.5.orig/drivers/ata/pata_sc1200.c linux-2.6.31.5/drivers/ata/pata_sc1200.c
+--- linux-2.6.31.5.orig/drivers/ata/pata_sc1200.c 2009-10-23 00:57:56.000000000 +0200
++++ linux-2.6.31.5/drivers/ata/pata_sc1200.c 2009-11-22 19:19:29.000000000 +0100
+@@ -236,7 +236,7 @@
+ .port_ops = &sc1200_port_ops
+ };
+ /* Can't enable port 2 yet, see top comments */
+- const struct ata_port_info *ppi[] = { &info, };
++ const struct ata_port_info *ppi[] = { &info, &ata_dummy_port_info };
+
+ return ata_pci_sff_init_one(dev, ppi, &sc1200_sht, NULL);
+ }