SPDX: Convert all of our single license tags to Linux Kernel style

[u-boot] / include / configs / ls2080ardb.h

diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h
index 6f3301c2fdc8381bec4dac9caf2403ad11e97b9b..73a405f8d93f2f43e8e4996dde8922ab5c14b947 100644 (file)
--- a/include/configs/ls2080ardb.h
+++ b/include/configs/ls2080ardb.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright 2017 NXP
  * Copyright 2015 Freescale Semiconductor
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __LS2_RDB_H
@@ -10,9 +9,6 @@
 
 #include "ls2080a_common.h"
 
-#undef CONFIG_CONS_INDEX
-#define CONFIG_CONS_INDEX       2
-
 #ifdef CONFIG_FSL_QSPI
 #ifdef CONFIG_TARGET_LS2081ARDB
 #define CONFIG_QIXIS_I2C_ACCESS
@@ -325,15 +321,11 @@ unsigned long get_board_sys_clk(void);
 
 /*  MMC  */
 #ifdef CONFIG_MMC
-#define CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
 #endif
 
 #define CONFIG_MISC_INIT_R
 
-#undef CONFIG_CMDLINE_EDITING
-#include <config_distro_defaults.h>
-
 #define BOOT_TARGET_DEVICES(func) \
        func(USB, usb, 0) \
        func(MMC, mmc, 0) \
@@ -375,7 +367,7 @@ unsigned long get_board_sys_clk(void);
        "fdt_high=0xa0000000\0"                 \
        "initrd_high=0xffffffffffffffff\0"      \
        "fdt_addr=0x64f00000\0"                 \
-       "kernel_addr=0x65000000\0"              \
+       "kernel_addr=0x581000000\0"             \
        "kernel_start=0x1000000\0"              \
        "kernelheader_start=0x800000\0"         \
        "scriptaddr=0x80000000\0"               \
@@ -445,8 +437,8 @@ unsigned long get_board_sys_clk(void);
                        "&& esbc_validate 0x20780000; "                 \
                        "env exists mcinitcmd && "                      \
                        "fsl_mc lazyapply dpl 0x20d00000; "             \
-                       "run distro_bootcmd;env exists secureboot "     \
-                       " && esbc_halt;run qspi_bootcmd; "
+                       "run distro_bootcmd;run qspi_bootcmd; "         \
+                       "env exists secureboot && esbc_halt;"
 #elif defined(CONFIG_SD_BOOT)
 /* Try to boot an on-SD kernel first, then do normal distro boot */
 #define CONFIG_BOOTCOMMAND                                             \
@@ -456,16 +448,16 @@ unsigned long get_board_sys_clk(void);
                        "env exists mcinitcmd && run mcinitcmd "        \
                        "&& mmc read 0x88000000 0x6800 0x800 "          \
                        "&& fsl_mc lazyapply dpl 0x88000000; "          \
-                       "run distro_bootcmd;env exists secureboot "     \
-                       "&& esbc_halt;run sd_bootcmd;"
+                       "run distro_bootcmd;run sd_bootcmd; "           \
+                       "env exists secureboot && esbc_halt;"
 #else
 /* Try to boot an on-NOR kernel first, then do normal distro boot */
 #define CONFIG_BOOTCOMMAND                                             \
                        "env exists mcinitcmd && env exists secureboot "\
                        "&& esbc_validate 0x580780000; env exists mcinitcmd "\
                        "&& fsl_mc lazyapply dpl 0x580d00000;"          \
-                       "run distro_bootcmd; env exists secureboot "    \
-                       "&& esbc_halt; run nor_bootcmd;"
+                       "run distro_bootcmd;run nor_bootcmd; "          \
+                       "env exists secureboot && esbc_halt;"
 #endif
 
 /* MAC/PHY configuration */