X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fconfigs%2Fomap3_logic.h;h=7b8f402e14d982660b92dbd46e469bea0ccc59b1;hb=e745782c25aa00fb74801303413fbcc92dc45b35;hp=772fc60c9c3e17422202d8ec98b2622cbe7be0fc;hpb=102d86552abc82818c22b39fdef4b3a280a60643;p=u-boot diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index 772fc60c9c..7b8f402e14 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -1,11 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2011 Logic Product Development * Peter Barada * * Configuration settings for the Logic OMAP35x/DM37x SOM LV/Torpedo * reference boards. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H @@ -18,16 +17,7 @@ #include #ifdef CONFIG_SPL_BUILD -/* - * Disable MMC DM for SPL build and can be re-enabled after adding - * DM support in SPL - */ -#undef CONFIG_DM_MMC -#undef OMAP_HSMMC_USE_GPIO - /* select serial console configuration for SPL */ -#undef CONFIG_CONS_INDEX -#define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550_COM1 OMAP34XX_UART1 #endif @@ -38,7 +28,6 @@ * order to allow for BCH8 to fit in. */ #undef CONFIG_SPL_TEXT_BASE -#define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_TEXT_BASE 0x40200000 #define CONFIG_MISC_INIT_R /* misc_init_r dumps the die id */ @@ -49,49 +38,15 @@ /* Hardware drivers */ -/* GPIO banks */ -#define CONFIG_OMAP3_GPIO_4 /* GPIO 96..128 is in GPIO bank 4 */ -#define CONFIG_OMAP3_GPIO_6 /* GPIO160..191 is in GPIO bank 6 */ - -#define CONFIG_USB_OMAP3 - -/* commands to include */ -#define CONFIG_CMD_NAND -#define CONFIG_CMD_MTDPARTS -#define CONFIG_CMD_NAND_LOCK_UNLOCK /* nand (un)lock commands */ - /* I2C */ -#define CONFIG_SYS_I2C_OMAP34XX #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* EEPROM AT24C64 */ -/* USB */ -#define CONFIG_USB_MUSB_OMAP2PLUS -#define CONFIG_USB_MUSB_PIO_ONLY -#define CONFIG_USB_ETHER -#define CONFIG_USB_ETHER_RNDIS -#define CONFIG_USB_FUNCTION_FASTBOOT -#define CONFIG_CMD_FASTBOOT -#define CONFIG_ANDROID_BOOT_IMAGE -#define CONFIG_FASTBOOT_BUF_ADDR CONFIG_SYS_LOAD_ADDR -#define CONFIG_FASTBOOT_BUF_SIZE 0x07000000 - -/* TWL4030 */ -#define CONFIG_TWL4030_PWM -#define CONFIG_TWL4030_USB - /* Board NAND Info. */ #ifdef CONFIG_NAND -#define CONFIG_NAND_OMAP_GPMC - -#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_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 #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_PAGE_COUNT 64 #define CONFIG_SYS_NAND_PAGE_SIZE 2048 @@ -108,32 +63,22 @@ #define CONFIG_SYS_NAND_ECCSIZE 512 #define CONFIG_SYS_NAND_ECCBYTES 13 #define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_BCH8_CODE_HW_DETECTION_SW -#define CONFIG_BCH #define CONFIG_SYS_NAND_MAX_OOBFREE 2 #define CONFIG_SYS_NAND_MAX_ECCPOS 56 -#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000 #define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ #define CONFIG_MTD_PARTITIONS /* required for UBI partition support */ -#define MTDIDS_DEFAULT "nand0=omap2-nand.0" -#define MTDPARTS_DEFAULT "mtdparts=omap2-nand.0:"\ - "512k(MLO),"\ - "1792k(u-boot),"\ - "128k(spl-os)," \ - "128k(u-boot-env),"\ - "6m(kernel),-(fs)" #endif /* Environment information */ #define CONFIG_PREBOOT \ "setenv preboot;" \ - "nand unlock;" \ "saveenv;" #define CONFIG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ - "mtdids=" MTDIDS_DEFAULT "\0" \ - "mtdparts=" MTDPARTS_DEFAULT "\0" \ + "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \ + "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \ "mmcdev=0\0" \ "mmcroot=/dev/mmcblk0p2 rw\0" \ "mmcrootfstype=ext4 rootwait\0" \ @@ -147,7 +92,7 @@ "fi; " \ "else run defaultboot; fi\0" \ "defaultboot=run mmcramboot\0" \ - "consoledevice=ttyO0\0" \ + "consoledevice=ttyS0\0" \ "setconsole=setenv console ${consoledevice},${baudrate}n8\0" \ "dump_bootargs=echo 'Bootargs: '; echo $bootargs\0" \ "rotation=0\0" \ @@ -207,10 +152,10 @@ "run loadramdisk\0" \ "mmcramboot=setenv bootfile uImage; " \ "run mmcrambootcommon; " \ - "bootm ${loadaddr} ${rdaddr} ${fdtimage}\0" \ + "bootm ${loadaddr} ${rdaddr} ${fdtaddr}\0" \ "mmcrambootz=setenv bootfile zImage; " \ "run mmcrambootcommon; " \ - "bootz ${loadaddr} ${rdaddr} ${fdtimage}\0" \ + "bootz ${loadaddr} ${rdaddr} ${fdtaddr}\0" \ "tftpboot=echo 'Booting kernel/ramdisk rootfs from tftp...'; " \ "run ramargs; " \ "run common_bootargs; " \ @@ -226,7 +171,6 @@ "tftpboot $loadaddr zImage;" \ "bootz $loadaddr\0" \ "nandbootcommon=echo 'Booting kernel from NAND...';" \ - "nand unlock;" \ "run nandargs;" \ "run common_bootargs;" \ "run dump_bootargs;" \ @@ -257,30 +201,17 @@ /* Monitor at start of flash */ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE -#define CONFIG_ENV_IS_IN_NAND 1 #define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */ -#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 - -/* SMSC922x Ethernet */ -#if defined(CONFIG_CMD_NET) -#define CONFIG_SMC911X -#define CONFIG_SMC911X_32_BIT -#define CONFIG_SMC911X_BASE 0x08000000 -#endif /* (CONFIG_CMD_NET) */ +#define CONFIG_ENV_OFFSET 0x260000 +#define CONFIG_ENV_ADDR 0x260000 /* Defines for SPL */ -#define CONFIG_SPL_OMAP3_ID_NAND - /* NAND: SPL falcon mode configs */ #ifdef CONFIG_SPL_OS_BOOT -#define CONFIG_CMD_SPL_NAND_OFS 0x240000 #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x280000 -#define CONFIG_CMD_SPL_WRITE_SIZE 0x2000 #endif #endif /* __CONFIG_H */