Merge tag 'efi-2020-07-rc2-4' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi

[oweals/u-boot.git] / include / configs / udoo_neo.h

diff --git a/include/configs/udoo_neo.h b/include/configs/udoo_neo.h
index 9835ce887536859f6ab292d59b99da9eca0dd69c..4b3df0451a96d31376a9fc7983cbe51bc9d0eeed 100644 (file)
--- a/include/configs/udoo_neo.h
+++ b/include/configs/udoo_neo.h
@@ -1,17 +1,15 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright 2014-2015 Freescale Semiconductor, Inc.
  * Copyright Jasbir Matharu
  * Copyright 2015 UDOO Team
  *
  * Configuration settings for the UDOO NEO board.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#include <config_distro_defaults.h>
 #include "mx6_common.h"
 
 #include "imx6_spl.h"
@@ -28,12 +26,13 @@
 #define CONFIG_SYS_MMC_ENV_DEV         0  /*USDHC2*/
 
 /* Linux only */
-#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
 #define CONFIG_EXTRA_ENV_SETTINGS \
+       "console=ttymxc0,115200\0" \
        "fdt_high=0xffffffff\0" \
        "initrd_high=0xffffffff\0" \
        "fdtfile=undefined\0" \
        "fdt_addr=0x83000000\0" \
+       "fdt_addr_r=0x83000000\0" \
        "ip_dyn=yes\0" \
        "mmcdev=0\0" \
        "mmcrootfstype=ext4\0" \
@@ -47,11 +46,10 @@
                "if test $board_name = EXTENDED; then " \
                        "setenv fdtfile imx6sx-udoo-neo-extended.dtb; fi; " \
                "if test $fdtfile = UNDEFINED; then " \
-                       "echo WARNING: Could not determine dtb to use; fi; \0" \
+                       "echo WARNING: Could not determine dtb to use; fi\0" \
        "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
        "pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
-       "ramdisk_addr_r=0x83000000\0" \
-       "ramdiskaddr=0x83000000\0" \
+       "ramdisk_addr_r=0x84000000\0" \
        "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \
        BOOTENV
 
@@ -59,19 +57,11 @@
        func(MMC, mmc, 0) \
        func(DHCP, dhcp, na)
 
-#define CONFIG_BOOTCOMMAND \
-       "run findfdt; " \
-       "run distro_bootcmd"
-
 #include <config_distro_bootcmd.h>
 
 /* Miscellaneous configurable options */
-#define CONFIG_SYS_MEMTEST_START       0x80000000
-#define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_MEMTEST_START + 0x10000)
-#define CONFIG_STACKSIZE               SZ_128K
 
 /* Physical Memory Map */
-#define CONFIG_NR_DRAM_BANKS           1
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 #define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
 #define CONFIG_SYS_INIT_RAM_ADDR       IRAM_BASE_ADDR
@@ -83,9 +73,6 @@
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
 /* Environment organization */
-#define CONFIG_ENV_OFFSET              (8 * SZ_64K)
-#define CONFIG_ENV_SIZE                        SZ_8K
-#define CONFIG_ENV_IS_IN_MMC
 
 #define CONFIG_IMX_THERMAL
 
@@ -104,7 +91,6 @@
 
 /* Network */
 #define CONFIG_FEC_MXC
-#define CONFIG_MII
 
 #define CONFIG_FEC_ENET_DEV 0
 #define IMX_FEC_BASE                   ENET_BASE_ADDR
@@ -113,7 +99,4 @@
 #define CONFIG_FEC_XCV_TYPE             RMII
 #define CONFIG_ETHPRIME                 "FEC0"
 
-#define CONFIG_PHYLIB
-#define CONFIG_PHY_MICREL
-
 #endif                         /* __CONFIG_H */