treewide: Fix Marek's name and change my e-mail address

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

diff --git a/include/configs/turris_mox.h b/include/configs/turris_mox.h
index 0de40eddcb5b1ec6545a06fff373c99874addd24..b8ff705ac923d2248df0884b0c652c5f2fd93a6c 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 <[email protected]>
+ * Copyright (C) 2018 Marek Behún <[email protected]>
  *
  * Based on mvebu_armada-37xx.h by Stefan Roese <[email protected]>
  */
@@ -8,90 +8,41 @@
 #ifndef _CONFIG_TURRIS_MOX_H
 #define _CONFIG_TURRIS_MOX_H
 
-#define CONFIG_SYS_BOOTM_LEN (64 << 20)
-
-#define CONFIG_LAST_STAGE_INIT
-
-/*
- * High Level Configuration Options (easy to change)
- */
-#define CONFIG_DISPLAY_BOARDINFO_LATE
-
-/* additions for new ARM relocation support */
-#define CONFIG_SYS_SDRAM_BASE  0x00000000
-
-/* auto boot */
-#define CONFIG_PREBOOT
-
-#define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, \
-                                         115200, 230400, 460800, 921600 }
-
-/*
- * For booting Linux, the board info and command line data
- * have to be in the first 8 MB of memory, since this is
- * the maximum mapped by the Linux kernel during initialization.
- */
-#define CONFIG_CMDLINE_TAG             /* enable passing of ATAGs  */
-#define CONFIG_INITRD_TAG              /* enable INITRD tag */
-#define CONFIG_SETUP_MEMORY_TAGS       /* enable memory tag */
-
-#define        CONFIG_SYS_CBSIZE       1024    /* Console I/O Buff Size */
-
-/*
- * Size of malloc() pool
- */
-#define CONFIG_SYS_MALLOC_LEN  (4 << 20) /* 4MiB for malloc() */
-
-/*
- * Other required minimal configurations
- */
-#define CONFIG_ARCH_CPU_INIT           /* call arch_cpu_init() */
-#define CONFIG_SYS_LOAD_ADDR   0x00800000      /* default load adr- 8M */
-#define CONFIG_SYS_MEMTEST_START 0x00800000    /* 8M */
-#define CONFIG_SYS_MEMTEST_END 0x00ffffff      /*(_16M -1) */
-#define CONFIG_SYS_RESET_ADDRESS 0xffff0000    /* Rst Vector Adr */
-#define CONFIG_SYS_MAXARGS     32      /* max number of command args */
-
-#define CONFIG_SYS_ALT_MEMTEST
-
-/* End of 16M scrubbed by training in bootrom */
-#define CONFIG_SYS_INIT_SP_ADDR         (CONFIG_SYS_TEXT_BASE + 0xFF0000)
-
-/*
- * I2C
- */
-#define CONFIG_I2C_MV
-#define CONFIG_SYS_I2C_SLAVE           0x0
-
-/* Environment in SPI NOR flash */
-#define CONFIG_ENV_OFFSET              0x180000 /* as Marvell U-Boot version */
-#define CONFIG_ENV_SIZE                        (64 << 10) /* 64KiB */
-#define CONFIG_ENV_SECT_SIZE           (64 << 10) /* 64KiB sectors */
-
-/*
- * Ethernet Driver configuration
- */
-#define CONFIG_ENV_OVERWRITE   /* ethaddr can be reprogrammed */
-#define CONFIG_ARP_TIMEOUT     200
-#define CONFIG_NET_RETRY_COUNT 50
-#define CONFIG_PHY_MARVELL
-
-#define CONFIG_USB_MAX_CONTROLLER_COUNT (3 + 3)
+#define CONFIG_SYS_SDRAM_BASE          0x00000000
+#define CONFIG_SYS_BAUDRATE_TABLE      { 300, 600, 1200, 1800, 2400, 4800, \
+                                         9600, 19200, 38400, 57600, 115200, \
+                                         230400, 460800, 500000, 576000, \
+                                         921600, 1000000, 1152000, 1500000, \
+                                         2000000, 2500000, 3000000, 3500000, \
+                                         4000000, 4500000, 5000000, 5500000, \
+                                         6000000 }
 
 #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)
 
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_EXTRA_ENV_SETTINGS      \
-       "scriptaddr=0x4d00000\0"        \
-       "pxefile_addr_r=0x4e00000\0"    \
-       "fdt_addr_r=0x4f00000\0"        \
-       "kernel_addr_r=0x5000000\0"     \
-       "ramdisk_addr_r=0x8000000\0"    \
+#define TURRIS_MOX_BOOTCMD_RESCUE                                      \
+       "setenv bootargs \"console=ttyMV0,115200 "                      \
+                         "earlycon=ar3700_uart,0xd0012000\" && "       \
+       "sf probe && "                                                  \
+       "sf read 0x5000000 0x190000 && "                                \
+       "lzmadec 0x5000000 0x5800000 && "                               \
+       "bootm 0x5800000"
+
+#define CONFIG_EXTRA_ENV_SETTINGS                              \
+       "scriptaddr=0x4d00000\0"                                \
+       "pxefile_addr_r=0x4e00000\0"                            \
+       "fdt_addr_r=0x4f00000\0"                                \
+       "kernel_addr_r=0x5000000\0"                             \
+       "ramdisk_addr_r=0x8000000\0"                            \
+       "fdtfile=marvell/" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0"  \
+       "bootcmd_rescue=" TURRIS_MOX_BOOTCMD_RESCUE "\0"        \
        BOOTENV
 
 #endif /* _CONFIG_TURRIS_MOX_H */