From a85693b3bd4431b05b7df608b6f7733c0f80c53e Mon Sep 17 00:00:00 2001 From: Dirk Behme Date: Tue, 21 Apr 2009 17:30:51 +0200 Subject: OMAP3: Fix changed mmc init command In recent U-Boot mmcinit changed to mmc init. Signed-off-by: Steve Sakoman Signed-off-by: Dirk Behme --- include/configs/omap3_overo.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/configs/omap3_overo.h') diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h index 51b04b6..4398a66 100644 --- a/include/configs/omap3_overo.h +++ b/include/configs/omap3_overo.h @@ -172,7 +172,7 @@ "bootm ${loadaddr}\0" \ #define CONFIG_BOOTCOMMAND \ - "if mmcinit; then " \ + "if mmc init; then " \ "if run loadbootscript; then " \ "run bootscript; " \ "else " \ -- cgit v1.1 From 6a6b62e3aa4b340c4f8fc67b1487ddb5436c684d Mon Sep 17 00:00:00 2001 From: Sanjeev Premi Date: Mon, 27 Apr 2009 21:27:27 +0530 Subject: OMAP3: Use functions print_cpuinfo() and checkboard() Use the functions print_cpuinfo() and checkboard() to display the cpu and board specific information. These functions reuse content from the existing function display_board_info() - which has been removed. Also, updated the existig OMAP3 configurations to define: - CONFIG_DISPLAY_CPUINFO - CONFIG_DISPLAY_BOARDINFO Signed-off-by: Sanjeev Premi --- include/configs/omap3_overo.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'include/configs/omap3_overo.h') diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h index 4398a66..a8be4e6 100644 --- a/include/configs/omap3_overo.h +++ b/include/configs/omap3_overo.h @@ -33,6 +33,12 @@ #include /* get chip and board defs */ #include +/* + * Display CPU and Board information + */ +#define CONFIG_DISPLAY_CPUINFO 1 +#define CONFIG_DISPLAY_BOARDINFO 1 + /* Clock Defines */ #define V_OSCK 26000000 /* Clock output from T2 */ #define V_SCLK (V_OSCK >> 1) -- cgit v1.1 From 42bf4b2248146abdc592bde0009c6ea42067f437 Mon Sep 17 00:00:00 2001 From: Dirk Behme Date: Tue, 14 Apr 2009 20:15:17 +0200 Subject: OMAP3: Remove legacy NAND defines Remove remaining legacy NAND defines for Beagle, EVM, Overo and Pandora. Signed-off-by: Dirk Behme --- include/configs/omap3_overo.h | 30 ------------------------------ 1 file changed, 30 deletions(-) (limited to 'include/configs/omap3_overo.h') diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h index a8be4e6..d941497 100644 --- a/include/configs/omap3_overo.h +++ b/include/configs/omap3_overo.h @@ -128,19 +128,6 @@ #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */ /* devices */ -#define SECTORSIZE 512 - -#define NAND_ALLOW_ERASE_ALL -#define ADDR_COLUMN 1 -#define ADDR_PAGE 2 -#define ADDR_COLUMN_PAGE 3 - -#define NAND_ChipID_UNKNOWN 0x00 -#define NAND_MAX_FLOORS 1 -#define NAND_MAX_CHIPS 1 -#define NAND_NO_RB 1 -#define CONFIG_SYS_NAND_WP - #define CONFIG_JFFS2_NAND /* nand device jffs2 lives on */ #define CONFIG_JFFS2_DEV "nand0" @@ -299,21 +286,4 @@ extern unsigned int boot_flash_sec; extern unsigned int boot_flash_type; #endif - -#define WRITE_NAND_COMMAND(d, adr)\ - writel(d, &nand_cs_base->nand_cmd) -#define WRITE_NAND_ADDRESS(d, adr)\ - writel(d, &nand_cs_base->nand_adr) -#define WRITE_NAND(d, adr) writew(d, &nand_cs_base->nand_dat) -#define READ_NAND(adr) readl(&nand_cs_base->nand_dat) - -/* Other NAND Access APIs */ -#define NAND_WP_OFF() do {readl(&gpmc_cfg_base->config) |= GPMC_CONFIG_WP; } \ - while (0) -#define NAND_WP_ON() do {readl(&gpmc_cfg_base->config) &= ~GPMC_CONFIG_WP; } \ - while (0) -#define NAND_DISABLE_CE(nand) -#define NAND_ENABLE_CE(nand) -#define NAND_WAIT_READY(nand) udelay(10) - #endif /* __CONFIG_H */ -- cgit v1.1