projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'u-boot-at91-2022.07-b' of https://source.denx.de/u-boot/custodians/u-boot...
[platform/kernel/u-boot.git]
/
include
/
configs
/
sama5d3xek.h
diff --git
a/include/configs/sama5d3xek.h
b/include/configs/sama5d3xek.h
index
1bca98c
..
3be2c83
100644
(file)
--- a/
include/configs/sama5d3xek.h
+++ b/
include/configs/sama5d3xek.h
@@
-32,7
+32,6
@@
#ifdef CONFIG_MTD_NOR_FLASH
#define CONFIG_SYS_FLASH_BASE 0x10000000
#define CONFIG_SYS_MAX_FLASH_SECT 131
#ifdef CONFIG_MTD_NOR_FLASH
#define CONFIG_SYS_FLASH_BASE 0x10000000
#define CONFIG_SYS_MAX_FLASH_SECT 131
-#define CONFIG_SYS_MAX_FLASH_BANKS 1
#endif
/* SDRAM */
#endif
/* SDRAM */
@@
-56,7
+55,6
@@
#define CONFIG_SYS_NAND_MASK_ALE (1 << 21)
/* our CLE is AD22 */
#define CONFIG_SYS_NAND_MASK_CLE (1 << 22)
#define CONFIG_SYS_NAND_MASK_ALE (1 << 21)
/* our CLE is AD22 */
#define CONFIG_SYS_NAND_MASK_CLE (1 << 22)
-#define CONFIG_SYS_NAND_ONFI_DETECTION
#endif
/* USB */
#endif
/* USB */
@@
-81,6
+79,5
@@
#ifdef CONFIG_SD_BOOT
#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
#endif
#ifdef CONFIG_SD_BOOT
#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
#endif
-#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x40000
#endif
#endif