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 9e7bd88adb000a8c745c7ff104178661d8eabbae..9e6a8684589bc6d722fa66d45101720d4b248861 100644 (file)
--- a/include/configs/omap3_pandora.h
+++ b/include/configs/omap3_pandora.h
@@ -1,104 +1,51 @@
+/* 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 */
-#define CONFIG_NAND
-
 /* override base for compatibility with MLO the device ships with */
-#define CONFIG_SYS_TEXT_BASE           0x80008000
 
 #include <configs/ti_omap3_common.h>
 
-/*
- * Display CPU and Board information
- */
-#define CONFIG_DISPLAY_CPUINFO         1
-#define CONFIG_DISPLAY_BOARDINFO       1
-
-#define CONFIG_MISC_INIT_R
 #define CONFIG_REVISION_TAG            1
 
-#define CONFIG_ENV_SIZE                        (128 << 10)     /* 128 KiB */
-
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV   1
 #define CONFIG_SYS_DEVICE_NULLDEV      1
 
-/*
- * Hardware drivers
- */
-
-/* I2C Support */
-#define CONFIG_SYS_I2C_OMAP34XX
-
-/* TWL4030 LED */
-#define CONFIG_TWL4030_LED
-
-/* Initialize GPIOs by default */
-#define CONFIG_OMAP3_GPIO_4    /* GPIO96..127 is in GPIO Bank 4 */
-#define CONFIG_OMAP3_GPIO_6    /* GPIO160..191 is in GPIO Bank 6 */
-
-/*
- * 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_SYS_NAND_BUSWIDTH_16BIT
 #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_CMD_UBI         /* UBI-formated MTD partition support */
-#define CONFIG_CMD_UBIFS       /* Read-only UBI volume operations */
 
-#define CONFIG_RBTREE          /* required by CONFIG_CMD_UBI */
-#define CONFIG_LZO             /* required by CONFIG_CMD_UBIFS */
+#define CONFIG_BOOTCOMMAND \
+       "run distro_bootcmd; " \
+       "setenv bootargs ${bootargs_ubi}; " \
+       "if mmc rescan && load mmc 0:1 ${loadaddr} autoboot.scr; then " \
+               "source ${loadaddr}; " \
+       "fi; " \
+       "ubi part boot && ubifsmount ubi:boot && " \
+               "ubifsload ${loadaddr} uImage && bootm ${loadaddr}"
 
-#define CONFIG_MTD_PARTITIONS  /* required for UBI partition support */
+#define BOOT_TARGET_DEVICES(func) \
+       func(MMC, mmc, 0) \
 
-#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
+#include <config_distro_bootcmd.h>
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
        DEFAULT_LINUX_BOOT_ENV \
        "usbtty=cdc_acm\0" \
-       "bootargs=ubi.mtd=4 ubi.mtd=3 root=ubi0:rootfs rootfstype=ubifs " \
+       "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" \
-
-#define CONFIG_BOOTCOMMAND \
-       "if mmc rescan && fatload mmc1 0 ${loadaddr} autoboot.scr || " \
-                       "ext2load mmc1 0 ${loadaddr} autoboot.scr; then " \
-               "source ${loadaddr}; " \
-       "fi; " \
-       "ubi part boot && ubifsmount ubi:boot && " \
-               "ubifsload ${loadaddr} uImage && bootm ${loadaddr}"
+       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
+       BOOTENV \
 
 /* memtest works on */
 #define CONFIG_SYS_MEMTEST_START       (OMAP34XX_SDRC_CS0)
@@ -112,11 +59,7 @@
 /* Monitor at start of flash */
 #define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_FLASH_BASE
 
-#define CONFIG_ENV_IS_IN_NAND          1
-#define SMNAND_ENV_OFFSET              0x260000 /* environment starts here */
 
 #define CONFIG_SYS_ENV_SECT_SIZE       (128 << 10)     /* 128 KiB */
-#define CONFIG_ENV_OFFSET              SMNAND_ENV_OFFSET
-#define CONFIG_ENV_ADDR                        SMNAND_ENV_OFFSET
 
 #endif                         /* __CONFIG_H */