]> git.ipfire.org Git - people/ms/u-boot.git/blobdiff - include/configs/uniphier.h
ns16550: move CONFIG_SYS_NS16550 to Kconfig
[people/ms/u-boot.git] / include / configs / uniphier.h
index 850083c1106c8cbdd0f00ca6d53182dfdd19adde..056259849976188fa041b68dce90b67097decca9 100644 (file)
@@ -9,61 +9,10 @@
 #ifndef __CONFIG_UNIPHIER_COMMON_H__
 #define __CONFIG_UNIPHIER_COMMON_H__
 
-#if defined(CONFIG_MACH_PH1_PRO4)
-#define CONFIG_DDR_NUM_CH0 2
-#define CONFIG_DDR_NUM_CH1 2
-
-/* Physical start address of SDRAM */
-#define CONFIG_SDRAM0_BASE     0x80000000
-#define CONFIG_SDRAM0_SIZE     0x20000000
-#define CONFIG_SDRAM1_BASE     0xa0000000
-#define CONFIG_SDRAM1_SIZE     0x20000000
-#endif
-
-#if defined(CONFIG_MACH_PH1_LD4)
-#define CONFIG_DDR_NUM_CH0 1
-#define CONFIG_DDR_NUM_CH1 1
-
-/* Physical start address of SDRAM */
-#define CONFIG_SDRAM0_BASE     0x80000000
-#define CONFIG_SDRAM0_SIZE     0x10000000
-#define CONFIG_SDRAM1_BASE     0x90000000
-#define CONFIG_SDRAM1_SIZE     0x10000000
-#endif
-
-#if defined(CONFIG_MACH_PH1_SLD8)
-#define CONFIG_DDR_NUM_CH0 1
-#define CONFIG_DDR_NUM_CH1 1
-
-/* Physical start address of SDRAM */
-#define CONFIG_SDRAM0_BASE     0x80000000
-#define CONFIG_SDRAM0_SIZE     0x10000000
-#define CONFIG_SDRAM1_BASE     0x90000000
-#define CONFIG_SDRAM1_SIZE     0x10000000
-#endif
-
 #define CONFIG_I2C_EEPROM
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS  10
 
-/*
- * Support card address map
- */
-#if defined(CONFIG_PFC_MICRO_SUPPORT_CARD)
-# define CONFIG_SUPPORT_CARD_BASE      0x03f00000
-# define CONFIG_SUPPORT_CARD_ETHER_BASE        (CONFIG_SUPPORT_CARD_BASE + 0x00000000)
-# define CONFIG_SUPPORT_CARD_LED_BASE  (CONFIG_SUPPORT_CARD_BASE + 0x00090000)
-# define CONFIG_SUPPORT_CARD_UART_BASE (CONFIG_SUPPORT_CARD_BASE + 0x000b0000)
-#endif
-
-#if defined(CONFIG_DCC_MICRO_SUPPORT_CARD)
-# define CONFIG_SUPPORT_CARD_BASE      0x08000000
-# define CONFIG_SUPPORT_CARD_ETHER_BASE        (CONFIG_SUPPORT_CARD_BASE + 0x00000000)
-# define CONFIG_SUPPORT_CARD_LED_BASE  (CONFIG_SUPPORT_CARD_BASE + 0x00401630)
-# define CONFIG_SUPPORT_CARD_UART_BASE (CONFIG_SUPPORT_CARD_BASE + 0x00200000)
-#endif
-
 #ifdef CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550
 #define CONFIG_SYS_NS16550_COM1                CONFIG_SUPPORT_CARD_UART_BASE
 #define CONFIG_SYS_NS16550_CLK         12288000
 #define CONFIG_SYS_NS16550_REG_SIZE    -2
@@ -76,7 +25,8 @@
 
 #define CONFIG_SMC911X
 
-#define CONFIG_SMC911X_BASE            CONFIG_SUPPORT_CARD_ETHER_BASE
+/* dummy: referenced by examples/standalone/smc911x_eeprom.c */
+#define CONFIG_SMC911X_BASE    0
 #define CONFIG_SMC911X_32_BIT
 
 /*-----------------------------------------------------------------------
 
 #define CONFIG_FLASH_SHOW_PROGRESS     45 /* count down from 45/5: 9..1 */
 
-#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT 2
+#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT 1
 
 /* serial console configuration */
 #define CONFIG_BAUDRATE                        115200
 
-#define CONFIG_SYS_GENERIC_BOARD
 
 #if !defined(CONFIG_SPL_BUILD)
 #define CONFIG_USE_ARCH_MEMSET
 
 #define CONFIG_NAND_DENALI_ECC_SIZE                    1024
 
+#ifdef CONFIG_ARCH_UNIPHIER_PH1_SLD3
+#define CONFIG_SYS_NAND_REGS_BASE                      0xf8100000
+#define CONFIG_SYS_NAND_DATA_BASE                      0xf8000000
+#else
 #define CONFIG_SYS_NAND_REGS_BASE                      0x68100000
 #define CONFIG_SYS_NAND_DATA_BASE                      0x68000000
+#endif
 
 #define CONFIG_SYS_NAND_BASE           (CONFIG_SYS_NAND_DATA_BASE + 0x10)
 
 
 #define CONFIG_BOOTDELAY                       3
 #define CONFIG_ZERO_BOOTDELAY_CHECK    /* check for keypress on bootdelay==0 */
-#define CONFIG_AUTOBOOT_KEYED                  1
-#define CONFIG_AUTOBOOT_PROMPT \
-       "Press SPACE to abort autoboot in %d seconds\n", bootdelay
-#define CONFIG_AUTOBOOT_DELAY_STR              "d"
-#define CONFIG_AUTOBOOT_STOP_STR               " "
 
 /*
  * Network Configuration
 
 #define CONFIG_LOADADDR                        0x84000000
 #define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
-#define CONFIG_BOOTFILE                        "fit.itb"
 
 #define CONFIG_CMDLINE_EDITING         /* add command line history     */
 
        "ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:$netdev:off;" \
        "tftpboot; bootm;"
 
-#define CONFIG_BOOTARGS                " user_debug=0x1f init=/sbin/init"
-
-#define        CONFIG_EXTRA_ENV_SETTINGS               \
-       "netdev=eth0\0"                         \
-       "image_offset=0x00080000\0"             \
-       "image_size=0x00f00000\0"               \
-       "verify=n\0"                            \
-       "nandupdate=nand erase 0 0x100000 &&"                           \
-                  "tftpboot u-boot-spl.bin &&"                         \
-                  "nand write $loadaddr 0 0x10000 &&"                  \
-                  "tftpboot u-boot-dtb.img &&"                         \
-                  "nand write $loadaddr 0x10000 0xf0000\0"             \
-       "norboot=run add_default_bootargs &&"                           \
-               "bootm $image_offset\0"                                 \
-       "nandboot=run add_default_bootargs &&"                          \
-                "nand read $loadaddr $image_offset $image_size &&"     \
-                "bootm\0"                                              \
-       "add_default_bootargs=setenv bootargs $bootargs"                \
-               " console=ttyS0,$baudrate\0"                            \
+#ifdef CONFIG_FIT
+#define CONFIG_BOOTFILE                        "fitImage"
+#define LINUXBOOT_ENV_SETTINGS \
+       "fit_addr=0x00100000\0" \
+       "fit_addr_r=0x84100000\0" \
+       "fit_size=0x00f00000\0" \
+       "norboot=setexpr fit_addr $nor_base + $fit_addr &&" \
+               "bootm $fit_addr\0" \
+       "nandboot=nand read $fit_addr_r $fit_addr $fit_size &&" \
+               "bootm $fit_addr_r\0" \
+       "tftpboot=tftpboot $fit_addr_r $bootfile &&" \
+               "bootm $fit_addr_r\0"
+#else
+#define CONFIG_BOOTFILE                        "uImage"
+#define LINUXBOOT_ENV_SETTINGS \
+       "fdt_addr=0x00100000\0" \
+       "fdt_addr_r=0x84100000\0" \
+       "fdt_size=0x00008000\0" \
+       "fdt_file=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
+       "kernel_addr=0x00200000\0" \
+       "kernel_addr_r=0x84200000\0" \
+       "kernel_size=0x00800000\0" \
+       "ramdisk_addr=0x00a00000\0" \
+       "ramdisk_addr_r=0x84a00000\0" \
+       "ramdisk_size=0x00600000\0" \
+       "ramdisk_file=rootfs.cpio.uboot\0" \
+       "norboot=setexpr kernel_addr $nor_base + $kernel_addr &&" \
+               "setexpr ramdisk_addr $nor_base + $ramdisk_addr &&" \
+               "setexpr fdt_addr $nor_base + $fdt_addr &&" \
+               "bootm $kernel_addr $ramdisk_addr $fdt_addr\0" \
+       "nandboot=nand read $kernel_addr_r $kernel_addr $kernel_size &&" \
+               "nand read $ramdisk_addr_r $ramdisk_addr $ramdisk_size &&" \
+               "nand read $fdt_addr_r $fdt_addr $fdt_size &&" \
+               "bootm $kernel_addr_r $ramdisk_addr_r $fdt_addr_r\0" \
+       "tftpboot=tftpboot $kernel_addr_r $bootfile &&" \
+               "tftpboot $ramdisk_addr_r $ramdisk_file &&" \
+               "tftpboot $fdt_addr_r $fdt_file &&" \
+               "bootm $kernel_addr_r $ramdisk_addr_r $fdt_addr_r\0"
+#endif
+
+#define        CONFIG_EXTRA_ENV_SETTINGS                               \
+       "netdev=eth0\0"                                         \
+       "verify=n\0"                                            \
+       "norbase=0x42000000\0"                                  \
+       "nandupdate=nand erase 0 0x00100000 &&"                 \
+               "tftpboot u-boot-spl-dtb.bin &&"                \
+               "nand write $loadaddr 0 0x00010000 &&"          \
+               "tftpboot u-boot-dtb.img &&"                    \
+               "nand write $loadaddr 0x00010000 0x000f0000\0"  \
+       LINUXBOOT_ENV_SETTINGS
 
 /* Open Firmware flat tree */
 #define CONFIG_OF_LIBFDT
 
-#define CONFIG_LIB_RAND
-
-#define CONFIG_HAVE_ARM_SECURE
-
-/* Memory Size & Mapping */
-#define CONFIG_SYS_SDRAM_BASE          CONFIG_SDRAM0_BASE
-
-#if CONFIG_SDRAM0_BASE + CONFIG_SDRAM0_SIZE >= CONFIG_SDRAM1_BASE
-/* Thre is no memory hole */
-#define CONFIG_NR_DRAM_BANKS           1
-#define CONFIG_SYS_SDRAM_SIZE  (CONFIG_SDRAM0_SIZE + CONFIG_SDRAM1_SIZE)
-#else
+#define CONFIG_SYS_SDRAM_BASE          0x80000000
 #define CONFIG_NR_DRAM_BANKS           2
-#define CONFIG_SYS_SDRAM_SIZE  (CONFIG_SDRAM0_SIZE)
-#endif
 
-#if defined(CONFIG_MACH_PH1_LD4) || defined(CONFIG_MACH_PH1_SLD8)
+#if defined(CONFIG_ARCH_UNIPHIER_PH1_SLD3) || \
+       defined(CONFIG_ARCH_UNIPHIER_PH1_LD4) || \
+       defined(CONFIG_ARCH_UNIPHIER_PH1_SLD8)
 #define CONFIG_SPL_TEXT_BASE           0x00040000
-#endif
-#if defined(CONFIG_MACH_PH1_PRO4)
+#else
 #define CONFIG_SPL_TEXT_BASE           0x00100000
 #endif