aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2009-12-06 09:08:03 +0000
committerFlorian Fainelli <florian@openwrt.org>2009-12-06 09:08:03 +0000
commite4b952e89d8393e6ee85de5ecee53771900a607a (patch)
tree320b57da67aaa5226f4fc949aa78215e5a4e9b92
parent2d61e6cb2151752d1ab10bdb57aabbc46a62b5d9 (diff)
downloadupstream-e4b952e89d8393e6ee85de5ecee53771900a607a.tar.gz
upstream-e4b952e89d8393e6ee85de5ecee53771900a607a.tar.bz2
upstream-e4b952e89d8393e6ee85de5ecee53771900a607a.zip
[rdc] correct flash size and detection for sitecom targets (#6278), patch from rtz
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18671 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/rdc/files-2.6.30/arch/x86/mach-rdc321x/platform.c8
-rw-r--r--target/linux/rdc/sitecom/config-2.6.301
2 files changed, 4 insertions, 5 deletions
diff --git a/target/linux/rdc/files-2.6.30/arch/x86/mach-rdc321x/platform.c b/target/linux/rdc/files-2.6.30/arch/x86/mach-rdc321x/platform.c
index e319c02b33..f59cb15a7c 100644
--- a/target/linux/rdc/files-2.6.30/arch/x86/mach-rdc321x/platform.c
+++ b/target/linux/rdc/files-2.6.30/arch/x86/mach-rdc321x/platform.c
@@ -161,15 +161,15 @@ static int __init rdc_board_setup(void)
ROOT_DEV = 0;
rdc_map_info.name = rdc_flash_device.name;
- rdc_map_info.phys = 0xff000000;
- rdc_map_info.size = 0x1000000;
+ rdc_map_info.size = 0x800000; //8MB
+ rdc_map_info.phys = (u32) -rdc_map_info.size;
rdc_map_info.bankwidth = 2;
rdc_map_info.set_vpp = NULL;
simple_map_init(&rdc_map_info);
while (probe_flash_start(&rdc_map_info)) {
- rdc_map_info.phys++;
- if (--rdc_map_info.size)
+ if (rdc_map_info.size /= 2 < 0x100000) //1MB
panic("Could not find start of flash!");
+ rdc_map_info.phys = (u32) -rdc_map_info.size;
}
rdc_flash_resource.start = rdc_map_info.phys;
rdc_flash_data.width = rdc_map_info.bankwidth;
diff --git a/target/linux/rdc/sitecom/config-2.6.30 b/target/linux/rdc/sitecom/config-2.6.30
index e6bfa8886e..d756e87950 100644
--- a/target/linux/rdc/sitecom/config-2.6.30
+++ b/target/linux/rdc/sitecom/config-2.6.30
@@ -1,3 +1,2 @@
-# CONFIG_MTD_PHYSMAP is not set
# CONFIG_MTD_R8610 is not set
# CONFIG_MTD_RDC3210 is not set