Merge branch 'rpi-2023.04' of https://source.denx.de/u-boot/custodians/u-boot-raspberrypi

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

diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
index 563fff5..39f6ff8 100644 (file)
--- a/include/configs/at91sam9261ek.h
+++ b/include/configs/at91sam9261ek.h
@@ -11,56 +11,30 @@
 #define __CONFIG_H
 
 /* ARM asynchronous clock */
-#define CONFIG_SYS_AT91_SLOW_CLOCK     32768           /* slow clock xtal */
-#define CONFIG_SYS_AT91_MAIN_CLOCK     18432000        /* 18.432 MHz crystal */
+#define CFG_SYS_AT91_SLOW_CLOCK        32768           /* slow clock xtal */
+#define CFG_SYS_AT91_MAIN_CLOCK        18432000        /* 18.432 MHz crystal */
 
 #include <asm/hardware.h>
 
-/*
- * Hardware drivers
- */
-
-/* LCD */
-#define LCD_BPP                                LCD_COLOR8
-
 /* SDRAM */
-#define CONFIG_SYS_SDRAM_BASE          0x20000000
-#define CONFIG_SYS_SDRAM_SIZE          0x04000000
-#define CONFIG_SYS_INIT_RAM_SIZE       (16 * 1024)
-#define CONFIG_SYS_INIT_RAM_ADDR       ATMEL_BASE_SRAM
+#define CFG_SYS_SDRAM_BASE             0x20000000
+#define CFG_SYS_SDRAM_SIZE             0x04000000
+#define CFG_SYS_INIT_RAM_SIZE  (16 * 1024)
+#define CFG_SYS_INIT_RAM_ADDR  ATMEL_BASE_SRAM
 
 /* NAND flash */
 #ifdef CONFIG_CMD_NAND
-#define CONFIG_SYS_MAX_NAND_DEVICE             1
-#define CONFIG_SYS_NAND_BASE                   0x40000000
-#define CONFIG_SYS_NAND_DBW_8
+#define CFG_SYS_NAND_BASE                      0x40000000
 /* our ALE is AD22 */
-#define CONFIG_SYS_NAND_MASK_ALE               (1 << 22)
+#define CFG_SYS_NAND_MASK_ALE          (1 << 22)
 /* our CLE is AD21 */
-#define CONFIG_SYS_NAND_MASK_CLE               (1 << 21)
-#define CONFIG_SYS_NAND_ENABLE_PIN             AT91_PIN_PC14
-#define CONFIG_SYS_NAND_READY_PIN              AT91_PIN_PC15
+#define CFG_SYS_NAND_MASK_CLE          (1 << 21)
+#define CFG_SYS_NAND_ENABLE_PIN                AT91_PIN_PC14
+#define CFG_SYS_NAND_READY_PIN         AT91_PIN_PC15
 
 #endif
 
-/* Ethernet */
-#define CONFIG_DM9000_BASE             0x30000000
-#define DM9000_IO                      CONFIG_DM9000_BASE
-#define DM9000_DATA                    (CONFIG_DM9000_BASE + 4)
-#define CONFIG_DM9000_USE_16BIT
-#define CONFIG_DM9000_NO_SROM
-
 /* USB */
-#define CONFIG_USB_ATMEL
-#define CONFIG_USB_ATMEL_CLK_SEL_PLLB
-#define CONFIG_USB_OHCI_NEW
-#define CONFIG_SYS_USB_OHCI_CPU_INIT
-#define CONFIG_SYS_USB_OHCI_REGS_BASE          0x00500000      /* AT91SAM9261_UHP_BASE */
-#ifdef CONFIG_AT91SAM9G10EK
-#define CONFIG_SYS_USB_OHCI_SLOT_NAME          "at91sam9g10"
-#else
-#define CONFIG_SYS_USB_OHCI_SLOT_NAME          "at91sam9261"
-#endif
-#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS     2
+#define CFG_SYS_USB_OHCI_REGS_BASE             0x00500000      /* AT91SAM9261_UHP_BASE */
 
 #endif