diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2012-02-27 01:42:30 +0800 |
|---|---|---|
| committer | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2012-03-12 17:59:06 +0800 |
| commit | fc0b8fb688cb7b409d391c7dad552381e48ed590 (patch) | |
| tree | ef90e9a01301af49aeb50f24db2627f7c2765836 /arch/arm/boards/at91sam9263ek | |
| parent | d5b34cc0052f10397ded7756a2142784b5d08f28 (diff) | |
| download | barebox-fc0b8fb688cb7b409d391c7dad552381e48ed590.tar.gz barebox-fc0b8fb688cb7b409d391c7dad552381e48ed590.tar.xz | |
at91sam9263ek: add runtime nor detection
most of the board does not have a nor soldered
update the nand partition table to boot from nand with bootstrap
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'arch/arm/boards/at91sam9263ek')
| -rw-r--r-- | arch/arm/boards/at91sam9263ek/env/config | 6 | ||||
| -rw-r--r-- | arch/arm/boards/at91sam9263ek/init.c | 23 |
2 files changed, 17 insertions, 12 deletions
diff --git a/arch/arm/boards/at91sam9263ek/env/config b/arch/arm/boards/at91sam9263ek/env/config index e189b8e593..388a939539 100644 --- a/arch/arm/boards/at91sam9263ek/env/config +++ b/arch/arm/boards/at91sam9263ek/env/config @@ -25,10 +25,10 @@ kernelimage=uImage #kernelimage=Image.lzo nand_device=atmel_nand -nand_parts="256k(barebox)ro,128k(bareboxenv),1536k(kernel),-(root)" -rootfs_mtdblock_nand=3 +nand_parts="128k(at91bootstrap),256k(barebox)ro,128k(bareboxenv),128k(bareboxenv2),4M(kernel),120M(rootfs),-(data)" +rootfs_mtdblock_nand=5 -nor_parts="256k(barebox),64k(bareboxenv),1536k(kernel),-(root)" +nor_parts="256k(barebox),64k(bareboxenv),4M(kernel),-(root)" autoboot_timeout=3 diff --git a/arch/arm/boards/at91sam9263ek/init.c b/arch/arm/boards/at91sam9263ek/init.c index d7b9afe5db..1c52accd46 100644 --- a/arch/arm/boards/at91sam9263ek/init.c +++ b/arch/arm/boards/at91sam9263ek/init.c @@ -32,6 +32,7 @@ #include <io.h> #include <asm/hardware.h> #include <nand.h> +#include <sizes.h> #include <linux/mtd/nand.h> #include <mach/at91_pmc.h> #include <mach/board.h> @@ -129,15 +130,19 @@ static int at91sam9263ek_devices_init(void) add_cfi_flash_device(0, AT91_CHIPSELECT_0, 8 * 1024 * 1024, 0); ek_add_device_mci(); -#if defined(CONFIG_DRIVER_CFI) || defined(CONFIG_DRIVER_CFI_OLD) - devfs_add_partition("nor0", 0x00000, 0x40000, PARTITION_FIXED, "self"); - devfs_add_partition("nor0", 0x40000, 0x20000, PARTITION_FIXED, "env0"); -#elif defined(CONFIG_NAND_ATMEL) - devfs_add_partition("nand0", 0x00000, 0x80000, PARTITION_FIXED, "self_raw"); - dev_add_bb_dev("self_raw", "self0"); - devfs_add_partition("nand0", 0x80000, 0x20000, PARTITION_FIXED, "env_raw"); - dev_add_bb_dev("env_raw", "env0"); -#endif + if (IS_ENABLED(CONFIG_DRIVER_CFI) && cdev_by_name("nor0")) { + devfs_add_partition("nor0", 0x00000, 0x40000, PARTITION_FIXED, "self"); + devfs_add_partition("nor0", 0x40000, 0x20000, PARTITION_FIXED, "env0"); + } else if (IS_ENABLED(CONFIG_NAND_ATMEL)) { + devfs_add_partition("nand0", 0x00000, SZ_128K, PARTITION_FIXED, "at91bootstrap_raw"); + dev_add_bb_dev("at91bootstrap_raw", "at91bootstrap"); + devfs_add_partition("nand0", SZ_128K, SZ_256K, PARTITION_FIXED, "self_raw"); + dev_add_bb_dev("self_raw", "self0"); + devfs_add_partition("nand0", SZ_256K + SZ_128K, SZ_128K, PARTITION_FIXED, "env_raw"); + dev_add_bb_dev("env_raw", "env0"); + devfs_add_partition("nand0", SZ_512K, SZ_128K, PARTITION_FIXED, "env_raw1"); + dev_add_bb_dev("env_raw1", "env1"); + } armlinux_set_bootparams((void *)(AT91_CHIPSELECT_1 + 0x100)); armlinux_set_architecture(MACH_TYPE_AT91SAM9263EK); |