Merge tag 'u-boot-nand-20230417' of https://source.denx.de/u-boot/custodians/u-boot...

[platform/kernel/u-boot.git] / include / configs / at91sam9260ek.h

diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
index ca5815f..b9cc7ba 100644 (file)
--- a/include/configs/at91sam9260ek.h
+++ b/include/configs/at91sam9260ek.h
@@ -24,35 +24,33 @@
  */
 
 /* ARM asynchronous clock */
-#define CONFIG_SYS_AT91_SLOW_CLOCK     32768           /* slow clock xtal */
-#define CONFIG_SYS_AT91_MAIN_CLOCK     18432000        /* main clock xtal */
+#define CFG_SYS_AT91_SLOW_CLOCK        32768           /* slow clock xtal */
+#define CFG_SYS_AT91_MAIN_CLOCK        18432000        /* main clock xtal */
 
 /*
  * SDRAM: 1 bank, min 32, max 128 MB
  * Initialized before u-boot gets started.
  */
-#define CONFIG_SYS_SDRAM_BASE          ATMEL_BASE_CS1
-#define CONFIG_SYS_SDRAM_SIZE          0x04000000
+#define CFG_SYS_SDRAM_BASE             ATMEL_BASE_CS1
+#define CFG_SYS_SDRAM_SIZE             0x04000000
 
-#define CONFIG_SYS_INIT_RAM_SIZE       (16 * 1024)
+#define CFG_SYS_INIT_RAM_SIZE  (16 * 1024)
 #ifdef CONFIG_AT91SAM9XE
-# define CONFIG_SYS_INIT_RAM_ADDR      ATMEL_BASE_SRAM
+# define CFG_SYS_INIT_RAM_ADDR ATMEL_BASE_SRAM
 #else
-# define CONFIG_SYS_INIT_RAM_ADDR      ATMEL_BASE_SRAM1
+# define CFG_SYS_INIT_RAM_ADDR ATMEL_BASE_SRAM1
 #endif
 
 /* NAND flash */
 #ifdef CONFIG_CMD_NAND
-#define CONFIG_SYS_MAX_NAND_DEVICE     1
-#define CONFIG_SYS_NAND_BASE           ATMEL_BASE_CS3
-#define CONFIG_SYS_NAND_DBW_8
-#define CONFIG_SYS_NAND_MASK_ALE       (1 << 21)
-#define CONFIG_SYS_NAND_MASK_CLE       (1 << 22)
-#define CONFIG_SYS_NAND_ENABLE_PIN     AT91_PIN_PC14
-#define CONFIG_SYS_NAND_READY_PIN      AT91_PIN_PC13
+#define CFG_SYS_NAND_BASE              ATMEL_BASE_CS3
+#define CFG_SYS_NAND_MASK_ALE  (1 << 21)
+#define CFG_SYS_NAND_MASK_CLE  (1 << 22)
+#define CFG_SYS_NAND_ENABLE_PIN        AT91_PIN_PC14
+#define CFG_SYS_NAND_READY_PIN AT91_PIN_PC13
 #endif
 
 /* USB */
-#define CONFIG_SYS_USB_OHCI_REGS_BASE          0x00500000      /* AT91SAM9260_UHP_BASE */
+#define CFG_SYS_USB_OHCI_REGS_BASE             0x00500000      /* AT91SAM9260_UHP_BASE */
 
 #endif