diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-07-12 08:22:03 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-07-12 08:22:03 +0200 |
| commit | 6ffe2ec8cd37e432fdfc08f71cb9a46767ef1e39 (patch) | |
| tree | 4ef60a59d5ca2ab0bb4391da3175fd868bffebbc /arch/arm | |
| parent | a2f567095ba3831a3198aa2e1cacda2f5dcbf820 (diff) | |
| parent | 0be6fd0bf642541dbe999dbead7c3ae7e9c9db16 (diff) | |
| download | barebox-6ffe2ec8cd37e432fdfc08f71cb9a46767ef1e39.tar.gz barebox-6ffe2ec8cd37e432fdfc08f71cb9a46767ef1e39.tar.xz | |
Merge remote branch 'origin/omap' into next
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-omap/Kconfig | 14 | ||||
| -rw-r--r-- | arch/arm/mach-omap/include/mach/gpmc_nand.h | 45 |
2 files changed, 1 insertions, 58 deletions
diff --git a/arch/arm/mach-omap/Kconfig b/arch/arm/mach-omap/Kconfig index 99b9f9d973..e5230802ec 100644 --- a/arch/arm/mach-omap/Kconfig +++ b/arch/arm/mach-omap/Kconfig @@ -39,20 +39,6 @@ config ARCH_OMAP3 endchoice -config OMAP_CONFIG_STACKSIZE - prompt "STACKSIZE" - hex - default 0x00020000 - help - Select the Stack Size when defaults are used - -config OMAP_MALLOC_LEN - prompt "MALLOC LENGTH" - hex - default 0x00001000 - help - Select the Malloc Length when defaults are used - ### Generic Clock configurations to be enabled by Mach - invisible to enable. config OMAP_CLOCK_UART bool diff --git a/arch/arm/mach-omap/include/mach/gpmc_nand.h b/arch/arm/mach-omap/include/mach/gpmc_nand.h index c6c51d5d52..e23faabcac 100644 --- a/arch/arm/mach-omap/include/mach/gpmc_nand.h +++ b/arch/arm/mach-omap/include/mach/gpmc_nand.h @@ -68,54 +68,11 @@ struct gpmc_nand_platform_data { #define NAND_WAITPOL_HIGH (1 << 0) #define NAND_WAITPOL_MASK (1 << 0) -#ifdef CONFIG_NAND_OMAP_GPMC_HWECC /** plat_options: hw ecc enabled */ #define NAND_HWECC_ENABLE (1 << 1) -#endif /** plat_options: hw ecc disabled */ -#define NAND_HWECC_DISABLE (0 << 1) #define NAND_HWECC_MASK (1 << 1) -/* Typical BOOTROM oob layouts-requires hwecc **/ -#ifdef CONFIG_NAND_OMAP_GPMC_HWECC -/** Large Page x8 NAND device Layout */ -#define GPMC_NAND_ECC_LP_x8_LAYOUT {\ - .eccbytes = 12,\ - .eccpos = {1, 2, 3, 4, 5, 6, 7, 8,\ - 9, 10, 11, 12},\ - .oobfree = {\ - {.offset = 60,\ - .length = 2 } } \ -} - -/** Large Page x16 NAND device Layout */ -#define GPMC_NAND_ECC_LP_x16_LAYOUT {\ - .eccbytes = 12,\ - .eccpos = {2, 3, 4, 5, 6, 7, 8, 9,\ - 10, 11, 12, 13},\ - .oobfree = {\ - {.offset = 60,\ - .length = 2 } } \ -} - -/** Small Page x8 NAND device Layout */ -#define GPMC_NAND_ECC_SP_x8_LAYOUT {\ - .eccbytes = 3,\ - .eccpos = {1, 2, 3},\ - .oobfree = {\ - {.offset = 14,\ - .length = 2 } } \ -} - -/** Small Page x16 NAND device Layout */ -#define GPMC_NAND_ECC_SP_x16_LAYOUT {\ - .eccbytes = 3,\ - .eccpos = {2, 3, 4},\ - .oobfree = {\ - {.offset = 14,\ - .length = 2 } } \ -} - -#endif /* CONFIG_NAND_OMAP_GPMC_HWECC */ +int gpmc_generic_nand_devices_init(int cs, int width, int hwecc); #endif /* __ASM_OMAP_NAND_GPMC_H */ |