diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2009-11-11 17:29:35 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2010-01-17 09:17:26 -0500 |
| commit | b7659ef2e764f62fc334f0d970721496823e4888 (patch) | |
| tree | 1413ff4b1a5a226b2219db4c7a21a3892d3e08c5 | |
| parent | 7527feef06b13e9fd5b6d10a4bfc81b59ee56f27 (diff) | |
| download | talos-obmc-uboot-b7659ef2e764f62fc334f0d970721496823e4888.tar.gz talos-obmc-uboot-b7659ef2e764f62fc334f0d970721496823e4888.zip | |
Blackfin: bf527-ezkit: auto-select NAND settings
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| -rw-r--r-- | include/configs/bf527-ezkit.h | 11 | ||||
| -rw-r--r-- | include/configs/bf548-ezkit.h | 1 | ||||
| -rw-r--r-- | include/configs/bfin_adi_common.h | 2 |
3 files changed, 9 insertions, 5 deletions
diff --git a/include/configs/bf527-ezkit.h b/include/configs/bf527-ezkit.h index 5f3cb83629..c7322b8ed3 100644 --- a/include/configs/bf527-ezkit.h +++ b/include/configs/bf527-ezkit.h @@ -61,7 +61,8 @@ * (can't be used same time as ethernet) */ #if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_NAND) -#define CONFIG_BFIN_NFC +# define CONFIG_BFIN_NFC +# define CONFIG_BFIN_NFC_BOOTROM_ECC #endif #ifdef CONFIG_BFIN_NFC #define CONFIG_BFIN_NFC_CTL_VAL 0x0033 @@ -69,7 +70,6 @@ #define CONFIG_SYS_NAND_BASE 0 /* not actually used */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define NAND_MAX_CHIPS 1 -#define CONFIG_CMD_NAND #endif @@ -118,14 +118,19 @@ #define CONFIG_ENV_OFFSET 0x10000 #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE 0x10000 +#define CONFIG_ENV_IS_EMBEDDED_IN_LDR +#elif (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_NAND) +#define CONFIG_ENV_IS_IN_NAND +#define CONFIG_ENV_OFFSET 0x40000 +#define CONFIG_ENV_SIZE 0x20000 #else #define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_OFFSET 0x4000 #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET) #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_ENV_SECT_SIZE 0x2000 -#endif #define CONFIG_ENV_IS_EMBEDDED_IN_LDR +#endif /* diff --git a/include/configs/bf548-ezkit.h b/include/configs/bf548-ezkit.h index d0a9e491fc..297c3fda08 100644 --- a/include/configs/bf548-ezkit.h +++ b/include/configs/bf548-ezkit.h @@ -133,7 +133,6 @@ #define CONFIG_SYS_NAND_BASE 0 /* not actually used */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define NAND_MAX_CHIPS 1 -#define CONFIG_CMD_NAND /* diff --git a/include/configs/bfin_adi_common.h b/include/configs/bfin_adi_common.h index 42f4cbcfdd..db10ccca7c 100644 --- a/include/configs/bfin_adi_common.h +++ b/include/configs/bfin_adi_common.h @@ -45,7 +45,7 @@ # define CONFIG_CMD_USB_STORAGE # define CONFIG_DOS_PARTITION # endif -# ifdef CONFIG_NAND_PLAT +# if defined(CONFIG_NAND_PLAT) || defined(CONFIG_DRIVER_NAND_BFIN) # define CONFIG_CMD_NAND # endif # ifdef CONFIG_POST |
