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

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

diff --git a/include/configs/titanium.h b/include/configs/titanium.h
index 3fb63f30146d38d4aed974d9b2fd3c8011766171..2470855463fda3586a28a1968d9d58372fc856d3 100644 (file)
--- a/include/configs/titanium.h
+++ b/include/configs/titanium.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2013 Stefan Roese <sr@denx.de>
  *
@@ -6,8 +7,6 @@
  *
  * Based on mx6qsabrelite.h which is:
  * Copyright (C) 2010-2011 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __CONFIG_H
@@ -54,21 +53,17 @@
 #define CONFIG_SYS_MEMTEST_START       0x10000000
 #define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_MEMTEST_START + (500 << 20))
 
-#define CONFIG_HOSTNAME                        titanium
+#define CONFIG_HOSTNAME                        "titanium"
 #define CONFIG_UBI_PART                        ubi
 #define CONFIG_UBIFS_VOLUME            rootfs0
 
-#define MTDIDS_DEFAULT         "nand0=gpmi-nand"
-#define MTDPARTS_DEFAULT       "mtdparts=gpmi-nand:16M(uboot),512k(env1)," \
-                               "512k(env2),-(ubi)"
-
 #define CONFIG_EXTRA_ENV_SETTINGS \
-       "kernel=" __stringify(CONFIG_HOSTNAME) "/uImage\0"              \
+       "kernel=" CONFIG_HOSTNAME "/uImage\0"           \
        "kernel_fs=/boot/uImage\0"                                      \
        "kernel_addr=11000000\0"                                        \
-       "dtb=" __stringify(CONFIG_HOSTNAME) "/"                         \
-               __stringify(CONFIG_HOSTNAME) ".dtb\0"                   \
-       "dtb_fs=/boot/" __stringify(CONFIG_HOSTNAME) ".dtb\0"           \
+       "dtb=" CONFIG_HOSTNAME "/"                              \
+               CONFIG_HOSTNAME ".dtb\0"                        \
+       "dtb_fs=/boot/" CONFIG_HOSTNAME ".dtb\0"                \
        "dtb_addr=12800000\0"                                           \
        "script=boot.scr\0" \
        "uimage=uImage\0" \
@@ -97,7 +92,7 @@
        "rootpath=/opt/eldk-5.3/armv7a/rootfs-minimal-mtdutils\0"       \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
                "nfsroot=${serverip}:${rootpath}\0"                     \
-       "ubifs=" __stringify(CONFIG_HOSTNAME) "/ubifs.img\0"            \
+       "ubifs=" CONFIG_HOSTNAME "/ubifs.img\0"         \
        "part=" __stringify(CONFIG_UBI_PART) "\0"                       \
        "boot_vol=0\0"                                                  \
        "vol=" __stringify(CONFIG_UBIFS_VOLUME) "\0"                    \
@@ -107,8 +102,8 @@
        "upd_ubifs=run load_ubifs update_ubifs\0"                       \
        "init_ubi=nand erase.part ubi;ubi part ${part};"                \
                "ubi create ${vol} c800000\0"                           \
-       "mtdids=" MTDIDS_DEFAULT "\0"                                   \
-       "mtdparts=" MTDPARTS_DEFAULT "\0"                               \
+       "mtdids=" CONFIG_MTDIDS_DEFAULT "\0"                                    \
+       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0"                                \
        "nand_ubifs=run ubifs_mount ubifs_load ubifsargs addip"         \
                " addcon addmtd;"                                       \
                "bootm ${kernel_addr} - ${dtb_addr}\0"                  \
@@ -128,10 +123,6 @@
 
 #define CONFIG_BOOTCOMMAND             "run nand_ubifs"
 
-/* Print Buffer Size */
-#define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE + \
-                                        sizeof(CONFIG_SYS_PROMPT) + 16)
-
 /* Physical Memory Map */
 #define CONFIG_NR_DRAM_BANKS           1
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
@@ -150,16 +141,12 @@
 #ifdef CONFIG_CMD_NAND
 
 /* NAND stuff */
-#define CONFIG_NAND_MXS
 #define CONFIG_SYS_MAX_NAND_DEVICE     1
 #define CONFIG_SYS_NAND_BASE           0x40000000
 #define CONFIG_SYS_NAND_5_ADDR_CYCLE
 #define CONFIG_SYS_NAND_ONFI_DETECTION
 
 /* DMA stuff, needed for GPMI/MXS NAND support */
-#define CONFIG_APBH_DMA
-#define CONFIG_APBH_DMA_BURST
-#define CONFIG_APBH_DMA_BURST8
 
 /* Environment in NAND */
 #define CONFIG_ENV_OFFSET              (16 << 20)