[U-Boot] [PATCH] omap3_logic: Cleanup and remove redundant defines make bootz easier

Adam Ford aford173 at gmail.com
Thu Nov 5 02:25:29 CET 2015


>From 3af52a1a6d71ac3d78e0dec56da2fd8eb07a91d1 Mon Sep 17 00:00:00 2001
From: Adam Ford <aford173 at gmail.com>
Date: Wed, 4 Nov 2015 17:13:15 -0600
Subject: [PATCH] omap3_logic:  Cleanup and remove redundant defines make bootz
 easier

Some unnecesary includes still exist from the initial conversion
to ti_omap3_common.h

Add some boot scripts to allow for other boot options and unify some
environmental variable names with other omap3 devices.

Signed-off-by: Adam Ford <aford173 at gmail.com>
---
 include/configs/omap3_logic.h | 125 +++++++++++++++++++-----------------------
 1 file changed, 57 insertions(+), 68 deletions(-)

diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h
index ecd5615..ce06dd3 100644
--- a/include/configs/omap3_logic.h
+++ b/include/configs/omap3_logic.h
@@ -19,7 +19,8 @@
 #define CONFIG_SYS_TEXT_BASE 0x80400000

 #include <configs/ti_omap3_common.h>
-#define CONFIG_OMAP3_LOGIC /* working with Logic OMAP boards */
+
+
 /*
  * Display CPU and Board information
  */
@@ -27,29 +28,23 @@
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO

-/* Clock Defines */
-#define V_OSCK 26000000 /* Clock output from T2 */
-#define V_SCLK (V_OSCK >> 1)
-
 #define CONFIG_MISC_INIT_R /* misc_init_r dumps the die id */
-
 #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_INITRD_TAG
 #define CONFIG_REVISION_TAG
-
 #define CONFIG_CMDLINE_EDITING /* cmd line edit/history */
 #define CONFIG_ZERO_BOOTDELAY_CHECK /* check keypress w/no delay */

-/*
- * Size of malloc() pool
- */
+
 #define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */
  /* Sector */
 /*
  * Hardware drivers
  */

+#define CONFIG_USB_OMAP3
+
 /*
  * select serial console configuration
  */
@@ -58,58 +53,46 @@
 #define CONFIG_SYS_NS16550_COM1 OMAP34XX_UART1
 #define CONFIG_SERIAL1 1 /* UART1 on OMAP Logic boards */

-/* allow to overwrite serial and ethaddr */
-#define CONFIG_ENV_OVERWRITE
-#define CONFIG_BAUDRATE 115200
-#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\
- 115200}
-#define CONFIG_GENERIC_MMC
-#define CONFIG_MMC
-#define CONFIG_OMAP_HSMMC
-#define CONFIG_DOS_PARTITION

 /* commands to include */
 #define CONFIG_CMD_CACHE
-#define CONFIG_CMD_EXT2 /* EXT2 Support */
-#define CONFIG_CMD_FAT /* FAT support */
-#define CONFIG_CMD_MTDPARTS /* Enable MTD parts commands */
+#define CONFIG_CMD_EXT2
+#define CONFIG_CMD_FAT          /* FAT support                  */
+#define CONFIG_CMD_MTDPARTS
 #define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
-#define MTDIDS_DEFAULT "nand0=omap2-nand.0"
-#define MTDPARTS_DEFAULT "mtdparts=omap2-nand.0:512k(x-loader),"\
- "1920k(u-boot),128k(u-boot-env),"\
- "4m(kernel),-(fs)"
-
-#define CONFIG_CMD_I2C /* I2C serial bus support */
-#define CONFIG_CMD_MMC /* MMC support */
-#define CONFIG_CMD_NAND /* NAND support */
+#define MTDIDS_DEFAULT "nand0=omap2-nand.0"
+#define MTDPARTS_DEFAULT "mtdparts=omap2-nand.0:512k(x-loader),"\
+ "1920k(u-boot),128k(u-boot-env),"\
+ "4m(kernel),-(fs)"
+
 #define CONFIG_CMD_NAND_LOCK_UNLOCK /* nand (un)lock commands */
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_DHCP

-#define CONFIG_SYS_NO_FLASH
+#define CONFIG_YAFFS2

 /*
  * I2C
  */
-#define CONFIG_SYS_I2C
-#define CONFIG_SYS_OMAP24_I2C_SPEED 100000
-#define CONFIG_SYS_OMAP24_I2C_SLAVE 1
 #define CONFIG_SYS_I2C_OMAP34XX
+#define CONFIG_SYS_I2C_EEPROM_ADDR      0x50            /* EEPROM
AT24C64       */
+#define EXPANSION_EEPROM_I2C_BUS        2               /* I2C Bus
for AT24C64  */
+#define CONFIG_OMAP3_LOGIC_USE_NEW_PRODUCT_ID

 /*
  * TWL4030
  */
-
+#define CONFIG_TWL4030_PWM

 /*
  * Board NAND Info.
  */
+#define CONFIG_CMD_NAND
 #define CONFIG_SYS_NAND_BASE            NAND_BASE
 #define CONFIG_NAND_OMAP_GPMC
 #define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */
  /* to access nand */

-
 #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of */
  /* NAND devices */
 #define CONFIG_SYS_NAND_BUSWIDTH_16BIT
@@ -144,10 +127,13 @@

 #define CONFIG_EXTRA_ENV_SETTINGS \
  "loadaddr=0x81000000\0" \
- "bootfile=uImage\0" \
+ "uimage=uImage\0" \
+ "zimage=zImage\0" \
  "mtdids=" MTDIDS_DEFAULT "\0" \
  "mtdparts=" MTDPARTS_DEFAULT "\0" \
  "mmcdev=0\0" \
+ "mmcroot=/dev/mmcblk0p2 rw\0" \
+ "mmcrootfstype=ext3 rootwait\0" \
  "autoboot=mmc dev ${mmcdev}; if mmc rescan; then " \
  "if run loadbootscript; then " \
  "run bootscript; " \
@@ -165,34 +151,60 @@
  "setenv bootargs ${bootargs} omapfb.vrfb=y " \
  "omapfb.rotate=${rotation}; " \
  "fi\0" \
- "otherbootargs=ignore_loglevel early_printk no_console_suspend\0" \
+ "optargs=ignore_loglevel early_printk no_console_suspend\0" \
  "addmtdparts=setenv bootargs ${bootargs} ${mtdparts}\0" \
  "common_bootargs=setenv bootargs ${bootargs} display=${display} " \
- "${otherbootargs};" \
+ "${optargss};" \
  "run addmtdparts; " \
  "run vrfb_arg\0" \
  "loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \
  "bootscript=echo 'Running bootscript from mmc ...'; " \
  "source ${loadaddr}\0" \
- "loaduimage=mmc rescan ${mmcdev}; " \
- "fatload mmc ${mmcdev} ${loadaddr} ${bootfile}\0" \
+ "loaduimage=mmc rescan; " \
+ "fatload mmc ${mmcdev} ${loadaddr} ${uimage}\0" \
+ "loadzimage=mmc rescan; " \
+ "fatload mmc ${mmcdev} ${loadaddr} ${zimage}\0" \
  "ramdisksize=64000\0" \
  "ramdiskaddr=0x82000000\0" \
  "ramdiskimage=rootfs.ext2.gz.uboot\0" \
+ "loadramdisk=mmc rescan; " \
+ "fatload mmc ${mmcdev} ${ramdiskaddr} ${ramdiskimage}\0" \
  "ramargs=run setconsole; setenv bootargs console=${console} " \
  "root=/dev/ram rw ramdisk_size=${ramdisksize}\0" \
- "mmcramboot=echo 'Booting kernel from mmc w/ramdisk...'; " \
+ "mmcargs=run setconsole; setenv bootargs console=${console} " \
+ "${optargs} " \
+ "root=${mmcroot} " \
+ "rootfstype=${mmcrootfstype}\0" \
+ "fdtaddr=0x86000000\0" \
+ "loadfdtimage=mmc rescan; " \
+ "fatload mmc ${mmcdev} ${fdtaddr} ${fdtimage}\0" \
+ "mmcbootz=echo Booting with DT from mmc${mmcdev} ...; " \
+ "run mmcargs; " \
+ "run common_bootargs; " \
+ "run dump_bootargs; " \
+ "run loadzimage; " \
+ "run loadfdtimage; "\
+ "bootz ${loadaddr} - ${fdtaddr}\0" \
+ "mmcramboot=echo 'Booting uImage kernel from mmc w/ramdisk...'; " \
  "run ramargs; " \
  "run common_bootargs; " \
  "run dump_bootargs; " \
  "run loaduimage; " \
- "fatload mmc ${mmcdev} ${ramdiskaddr} ${ramdiskimage}; "\
+ "run loadramdisk; "\
  "bootm ${loadaddr} ${ramdiskaddr}\0" \
- "ramboot=echo 'Booting kernel/ramdisk rootfs from tftp...'; " \
+ "mmcrambootz=echo 'Booting zImage kernel from mmc w/ramdisk...'; " \
+ "run ramargs; " \
+ "run common_bootargs; " \
+ "run dump_bootargs; " \
+ "run loadzimage; " \
+ "run loadramdisk; "\
+ "run loadfdtimage; "\
+ "bootz ${loadaddr} ${ramdiskaddr} ${fdtaddr}\0; " \
+ "tftpboot=echo 'Booting kernel/ramdisk rootfs from tftp...'; " \
  "run ramargs; " \
  "run common_bootargs; " \
  "run dump_bootargs; " \
- "tftpboot ${loadaddr} ${bootfile}; "\
+ "tftpboot ${loadaddr} ${uimage}; "\
  "tftpboot ${ramdiskaddr} ${ramdiskimage}; "\
  "bootm ${loadaddr} ${ramdiskaddr}\0"

@@ -203,13 +215,6 @@
 /*
  * Miscellaneous configurable options
  */
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */
-#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */
-/* Print Buffer Size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
- sizeof(CONFIG_SYS_PROMPT) + 16)
-

 /* memtest works on */
 #define CONFIG_SYS_MEMTEST_START (OMAP34XX_SDRC_CS0)
@@ -217,26 +222,10 @@
  0x01F00000) /* 31MB */

 /*
- * OMAP3 has 12 GP timers, they can be driven by the system clock
- * (12/13/16.8/19.2/38.4MHz) or by 32KHz clock. We use 13MHz (V_SCLK).
- * This rate is divided by a local divisor.
- */
-#define CONFIG_SYS_TIMERBASE (OMAP34XX_GPT2)
-#define CONFIG_SYS_PTV 2 /* Divisor: 2^(PTV+1) => 8 */
-
-/*
- * Physical Memory Map
- */
-#define CONFIG_NR_DRAM_BANKS 2 /* CS1 may or may not be populated */
-#define PHYS_SDRAM_1 OMAP34XX_SDRC_CS0
-#define PHYS_SDRAM_2 OMAP34XX_SDRC_CS1
-
-/*
  * FLASH and environment organization
  */

 /* **** PISMO SUPPORT *** */
-#define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 2 sectors */

 #if defined(CONFIG_CMD_NAND)
 #define CONFIG_SYS_FLASH_BASE NAND_BASE
-- 
1.9.1


More information about the U-Boot mailing list