global: Migrate CONFIG_STACKBASE to CFG

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

diff --git a/include/configs/turris_mox.h b/include/configs/turris_mox.h
index dc2fdcc..3443c80 100644 (file)
--- a/include/configs/turris_mox.h
+++ b/include/configs/turris_mox.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
- * Copyright (C) 2018 Marek Behun <marek.behun@nic.cz>
+ * Copyright (C) 2018 Marek Behún <kabel@kernel.org>
  *
  * Based on mvebu_armada-37xx.h by Stefan Roese <sr@denx.de>
  */
@@ -8,12 +8,8 @@
 #ifndef _CONFIG_TURRIS_MOX_H
 #define _CONFIG_TURRIS_MOX_H
 
-#define CONFIG_SYS_BOOTM_LEN           (64 << 20)
-#define CONFIG_SYS_SDRAM_BASE          0x00000000
-#define CONFIG_SYS_INIT_SP_ADDR                (CONFIG_SYS_TEXT_BASE + 0xFF0000)
-#define CONFIG_SYS_CBSIZE              1024
-#define CONFIG_SYS_MAXARGS             32
-#define CONFIG_SYS_BAUDRATE_TABLE      { 300, 600, 1200, 1800, 2400, 4800, \
+#define CFG_SYS_SDRAM_BASE             0x00000000
+#define CFG_SYS_BAUDRATE_TABLE { 300, 600, 1200, 1800, 2400, 4800, \
                                          9600, 19200, 38400, 57600, 115200, \
                                          230400, 460800, 500000, 576000, \
                                          921600, 1000000, 1152000, 1500000, \
@@ -21,10 +17,10 @@
                                          4000000, 4500000, 5000000, 5500000, \
                                          6000000 }
 
-#define CONFIG_USB_MAX_CONTROLLER_COUNT        6
-
 #define BOOT_TARGET_DEVICES(func) \
        func(MMC, mmc, 0) \
+       func(NVME, nvme, 0) \
+       func(SCSI, scsi, 0) \
        func(USB, usb, 0) \
        func(PXE, pxe, na) \
        func(DHCP, dhcp, na)
@@ -39,7 +35,8 @@
        "lzmadec 0x5000000 0x5800000 && "                               \
        "bootm 0x5800000"
 
-#define CONFIG_EXTRA_ENV_SETTINGS                              \
+#define CFG_EXTRA_ENV_SETTINGS                         \
+       "fdt_addr=0x4c00000\0"                                  \
        "scriptaddr=0x4d00000\0"                                \
        "pxefile_addr_r=0x4e00000\0"                            \
        "fdt_addr_r=0x4f00000\0"                                \