Merge tag 'u-boot-rockchip-20191124' of https://gitlab.denx.de/u-boot/custodians...

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

diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h
index 659bf0776f0bda1329dbee5c43fb647a5f67bcbd..9e6a8684589bc6d722fa66d45101720d4b248861 100644 (file)
--- a/include/configs/omap3_pandora.h
+++ b/include/configs/omap3_pandora.h
@@ -1,68 +1,29 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2008-2010
  * Gražvydas Ignotas <notasas@gmail.com>
  *
  * Configuration settings for the OMAP3 Pandora.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_NR_DRAM_BANKS   2       /* CS1 may or may not be populated */
-
 /* override base for compatibility with MLO the device ships with */
-#define CONFIG_SYS_TEXT_BASE           0x80008000
 
 #include <configs/ti_omap3_common.h>
 
-#define CONFIG_MISC_INIT_R
 #define CONFIG_REVISION_TAG            1
 
-#define CONFIG_ENV_SIZE                        (128 << 10)     /* 128 KiB */
-
 #define CONFIG_SYS_DEVICE_NULLDEV      1
 
-/*
- * Hardware drivers
- */
-
-/* TWL4030 LED */
-#define CONFIG_TWL4030_LED
-
-/*
- * NS16550 Configuration
- */
-#undef CONFIG_SYS_NS16550_CLK
-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE    (-4)
-#define CONFIG_SYS_NS16550_CLK         V_NS16550_CLK
-#define CONFIG_SYS_NS16550_COM3                OMAP34XX_UART3
-#define CONFIG_SERIAL3                 3
-
-/* commands to include */
-
 /*
  * Board NAND Info.
  */
-#define CONFIG_SYS_NAND_ADDR           NAND_BASE       /* physical address */
-                                                       /* to access nand */
 #define CONFIG_NAND_OMAP_ECCSCHEME     OMAP_ECC_HAM1_CODE_SW
 #define CONFIG_SYS_NAND_PAGE_SIZE      2048
 #define CONFIG_SYS_NAND_OOBSIZE                64
 
-#ifdef CONFIG_NAND
-#define CONFIG_MTD_PARTITIONS  /* required for UBI partition support */
-
-#define MTDIDS_DEFAULT                 "nand0=omap2-nand.0"
-#define MTDPARTS_DEFAULT               "mtdparts=omap2-nand.0:512k(xloader),"\
-                                       "1920k(uboot),128k(uboot-env),"\
-                                       "10m(boot),-(rootfs)"
-#else
-#define MTDPARTS_DEFAULT
-#endif
-
 
 #define CONFIG_BOOTCOMMAND \
        "run distro_bootcmd; " \
@@ -83,7 +44,7 @@
        "usbtty=cdc_acm\0" \
        "bootargs_ubi=ubi.mtd=4 ubi.mtd=3 root=ubi0:rootfs rootfstype=ubifs " \
                "rw rootflags=bulk_read vram=6272K omapfb.vram=0:3000K\0" \
-       "mtdparts=" MTDPARTS_DEFAULT "\0" \
+       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        BOOTENV \
 
 /* memtest works on */
@@ -100,7 +61,5 @@
 
 
 #define CONFIG_SYS_ENV_SECT_SIZE       (128 << 10)     /* 128 KiB */
-#define CONFIG_ENV_OFFSET              0x260000
-#define CONFIG_ENV_ADDR                        0x260000
 
 #endif                         /* __CONFIG_H */