April 2009 - U-Boot

[U-Boot] [PATCH] tools/setlocalversion: use git svn instead of git-svn
by Peter Korsgaard 04 Apr '09

04 Apr '09

Use the correct git <subcmd> syntax instead of the deprecated git-<subcmd>. Signed-off-by: Peter Korsgaard <jacmet(a)sunsite.dk> --- tools/setlocalversion | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/setlocalversion b/tools/setlocalversion index bbb2ab2..b3f5f28 100755 --- a/tools/setlocalversion +++ b/tools/setlocalversion @@ -25,7 +25,7 @@ if head=`git rev-parse --verify HEAD 2>/dev/null`; then # Is this git on svn? if git config --get svn-remote.svn.url >/dev/null; then - printf -- '-svn%s' "`git-svn find-rev $head`" + printf -- '-svn%s' "`git svn find-rev $head`" fi fi -- 1.6.2

2 1

[U-Boot] [PATCH] eSPI: add the eSPI register support
by Mingkai Hu 04 Apr '09

04 Apr '09

Signed-off-by: Mingkai Hu <Mingkai.hu(a)freescale.com> --- include/asm-ppc/immap_85xx.h | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/include/asm-ppc/immap_85xx.h b/include/asm-ppc/immap_85xx.h index 7b97fe0..e84599d 100644 --- a/include/asm-ppc/immap_85xx.h +++ b/include/asm-ppc/immap_85xx.h @@ -258,6 +258,21 @@ typedef struct ccsr_lbc { } ccsr_lbc_t; /* + * eSPI Registers(0x7000-0x8000) + */ +typedef struct ccsr_espi { + uint mode; /* 0x00 - eSPI mode register */ + uint event; /* 0x04 - eSPI event register */ + uint mask; /* 0x08 - eSPI mask register */ + uint com; /* 0x0c - eSPI command register */ + uint tx; /* 0x10 - eSPI transmit FIFO access register */ + uint rx; /* 0x14 - eSPI receive FIFO access register */ + char res1[8]; /* reserved */ + uint csmode[4]; /* 0x20 - 0x2c: sSPI CS0/1/2/3 mode register */ + char res2[4048]; /* fill up to 0x1000 */ +} ccsr_espi_t; + +/* * PCI Registers(0x8000-0x9000) */ typedef struct ccsr_pcix { @@ -1682,6 +1697,8 @@ typedef struct ccsr_gur { #define CONFIG_SYS_MPC85xx_DDR2_ADDR (CONFIG_SYS_IMMR + CONFIG_SYS_MPC85xx_DDR2_OFFSET) #define CONFIG_SYS_MPC85xx_LBC_OFFSET (0x5000) #define CONFIG_SYS_MPC85xx_LBC_ADDR (CONFIG_SYS_IMMR + CONFIG_SYS_MPC85xx_LBC_OFFSET) +#define CONFIG_SYS_MPC85xx_ESPI_OFFSET (0x7000) +#define CONFIG_SYS_MPC85xx_ESPI_ADDR (CONFIG_SYS_IMMR + CONFIG_SYS_MPC85xx_ESPI_OFFSET) #define CONFIG_SYS_MPC85xx_PCIX_OFFSET (0x8000) #define CONFIG_SYS_MPC85xx_PCIX_ADDR (CONFIG_SYS_IMMR + CONFIG_SYS_MPC85xx_PCIX_OFFSET) #define CONFIG_SYS_MPC85xx_PCIX2_OFFSET (0x9000) -- 1.5.4

2 2

[U-Boot] [PATCH] cmd_mmc: add support device command for selecting mmc device (resend)
by Minkyu Kang 04 Apr '09

04 Apr '09

This patch improves device command for selecting mmc device Signed-off-by: Minkyu Kang <mk7.kang(a)samsung.com> --- common/cmd_mmc.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 56 insertions(+), 5 deletions(-) diff --git a/common/cmd_mmc.c b/common/cmd_mmc.c index 16c919b..fb99899 100644 --- a/common/cmd_mmc.c +++ b/common/cmd_mmc.c @@ -26,19 +26,70 @@ #include <mmc.h> #ifndef CONFIG_GENERIC_MMC +int curr_device = -1; + int do_mmc (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { - if (mmc_legacy_init (1) != 0) { - printf ("No MMC card found\n"); + int dev; + + if (argc < 2) { + cmd_usage(cmdtp); return 1; } + + if (strcmp(argv[1], "init") == 0) { + if (argc == 2) { + if (curr_device < 0) + dev = 1; + else + dev = curr_device; + } else if (argc == 3) { + dev = (int)simple_strtoul(argv[2], NULL, 10); + } else { + cmd_usage(cmdtp); + return 1; + } + + if (mmc_legacy_init(dev) != 0) { + puts("No MMC card found\n"); + return 1; + } + + curr_device = dev; + printf("mmc%d is available\n", curr_device); + } else if (strcmp(argv[1], "device") == 0) { + if (argc == 2) { + if (curr_device < 0) { + puts("No MMC device available\n"); + return 1; + } + } else if (argc == 3) { + dev = (int)simple_strtoul(argv[2], NULL, 10); + +#ifdef CONFIG_SYS_MMC_SET_DEV + if (mmc_set_dev(dev) != 0) + return 1; +#endif + curr_device = dev; + } else { + cmd_usage(cmdtp); + return 1; + } + + printf("mmc%d is current device\n", curr_device); + } else { + cmd_usage(cmdtp); + return 1; + } + return 0; } U_BOOT_CMD( - mmcinit, 1, 0, do_mmc, - "init mmc card", - NULL + mmc, 3, 1, do_mmc, + "MMC sub-system", + "init [dev] - init MMC sub system\n" + "mmc device [dev] - show or set current device\n" ); #else /* !CONFIG_GENERIC_MMC */

2 1

[U-Boot] [PATCH] at91sam9/at91cap: add new spi framework and spi flash support
by Jean-Christophe PLAGNIOL-VILLARD 04 Apr '09

04 Apr '09

The new Framework is not yet activated by default, it will be next release at the same time of the removal of the DATAFLASH support Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj(a)jcrosoft.com> --- board/afeb9260/afeb9260.c | 40 +++++++++++++++++++++++++++++ board/atmel/at91cap9adk/at91cap9adk.c | 24 ++++++++++++++++- board/atmel/at91sam9260ek/at91sam9260ek.c | 40 ++++++++++++++++++++++++++++- board/atmel/at91sam9261ek/at91sam9261ek.c | 40 ++++++++++++++++++++++++++++- board/atmel/at91sam9263ek/at91sam9263ek.c | 26 ++++++++++++++++++- board/atmel/at91sam9rlek/at91sam9rlek.c | 24 ++++++++++++++++- board/ronetix/pm9263/pm9263.c | 24 ++++++++++++++++- cpu/arm926ejs/at91/Makefile | 6 ++++ include/asm-arm/arch-at91/clk.h | 5 +++ include/asm-arm/arch-at91/hardware.h | 9 ++++++ include/configs/afeb9260.h | 7 +++++ include/configs/at91cap9adk.h | 7 +++++ include/configs/at91sam9260ek.h | 7 +++++ include/configs/at91sam9261ek.h | 7 +++++ include/configs/at91sam9263ek.h | 7 +++++ include/configs/at91sam9rlek.h | 7 +++++ include/configs/pm9263.h | 7 +++++ 17 files changed, 281 insertions(+), 6 deletions(-) diff --git a/board/afeb9260/afeb9260.c b/board/afeb9260/afeb9260.c index 024db2b..d1606b6 100644 --- a/board/afeb9260/afeb9260.c +++ b/board/afeb9260/afeb9260.c @@ -145,7 +145,11 @@ int board_init(void) #ifdef CONFIG_CMD_NAND afeb9260_nand_hw_init(); #endif +#if defined(CONFIG_ATMEL_SPI) + at91_spi0_hw_init((1 << 4) || (1 << 5)); +#elif defined(CONFIG_HAS_DATAFLASH) at91_spi0_hw_init((1 << 0) || (1 << 1)); +#endif #ifdef CONFIG_MACB afeb9260_macb_hw_init(); #endif @@ -181,3 +185,39 @@ int board_eth_init(bd_t *bis) #endif return rc; } + +/* SPI chip select control */ +#ifdef CONFIG_ATMEL_SPI +#include <spi.h> + +int spi_cs_is_valid(unsigned int bus, unsigned int cs) +{ + return bus == 0 && cs < 2; +} + +void spi_cs_activate(struct spi_slave *slave) +{ + switch(slave->cs) { + case 1: + at91_set_gpio_value(AT91_PIN_PC11, 0); + break; + case 0: + default: + at91_set_gpio_value(AT91_PIN_PA3, 0); + break; + } +} + +void spi_cs_deactivate(struct spi_slave *slave) +{ + switch(slave->cs) { + case 1: + at91_set_gpio_value(AT91_PIN_PC11, 1); + break; + case 0: + default: + at91_set_gpio_value(AT91_PIN_PA3, 1); + break; + } +} +#endif /* CONFIG_ATMEL_SPI */ diff --git a/board/atmel/at91cap9adk/at91cap9adk.c b/board/atmel/at91cap9adk/at91cap9adk.c index f52edaa..1e99bba 100644 --- a/board/atmel/at91cap9adk/at91cap9adk.c +++ b/board/atmel/at91cap9adk/at91cap9adk.c @@ -315,7 +315,9 @@ int board_init(void) #ifdef CONFIG_CMD_NAND at91cap9_nand_hw_init(); #endif -#ifdef CONFIG_HAS_DATAFLASH +#if defined(CONFIG_ATMEL_SPI) + at91_spi0_hw_init(1 << 4); +#elif defined(CONFIG_HAS_DATAFLASH) at91_spi0_hw_init(1 << 0); #endif #ifdef CONFIG_MACB @@ -358,3 +360,23 @@ int board_eth_init(bd_t *bis) #endif return rc; } + +/* SPI chip select control */ +#ifdef CONFIG_ATMEL_SPI +#include <spi.h> + +int spi_cs_is_valid(unsigned int bus, unsigned int cs) +{ + return bus == 0 && cs == 0; +} + +void spi_cs_activate(struct spi_slave *slave) +{ + at91_set_gpio_value(AT91_PIN_PA5, 0); +} + +void spi_cs_deactivate(struct spi_slave *slave) +{ + at91_set_gpio_value(AT91_PIN_PA5, 1); +} +#endif /* CONFIG_ATMEL_SPI */ diff --git a/board/atmel/at91sam9260ek/at91sam9260ek.c b/board/atmel/at91sam9260ek/at91sam9260ek.c index 6bd3b44..c4eaafd 100644 --- a/board/atmel/at91sam9260ek/at91sam9260ek.c +++ b/board/atmel/at91sam9260ek/at91sam9260ek.c @@ -155,7 +155,9 @@ int board_init(void) #ifdef CONFIG_CMD_NAND at91sam9260ek_nand_hw_init(); #endif -#ifdef CONFIG_HAS_DATAFLASH +#if defined(CONFIG_ATMEL_SPI) + at91_spi0_hw_init((1 << 4) || (1 << 5)); +#elif defined(CONFIG_HAS_DATAFLASH) at91_spi0_hw_init((1 << 0) || (1 << 1)); #endif #ifdef CONFIG_MACB @@ -193,3 +195,39 @@ int board_eth_init(bd_t *bis) #endif return rc; } + +/* SPI chip select control */ +#ifdef CONFIG_ATMEL_SPI +#include <spi.h> + +int spi_cs_is_valid(unsigned int bus, unsigned int cs) +{ + return bus == 0 && cs < 2; +} + +void spi_cs_activate(struct spi_slave *slave) +{ + switch(slave->cs) { + case 1: + at91_set_gpio_value(AT91_PIN_PC11, 0); + break; + case 0: + default: + at91_set_gpio_value(AT91_PIN_PA3, 0); + break; + } +} + +void spi_cs_deactivate(struct spi_slave *slave) +{ + switch(slave->cs) { + case 1: + at91_set_gpio_value(AT91_PIN_PC11, 1); + break; + case 0: + default: + at91_set_gpio_value(AT91_PIN_PA3, 1); + break; + } +} +#endif /* CONFIG_ATMEL_SPI */ diff --git a/board/atmel/at91sam9261ek/at91sam9261ek.c b/board/atmel/at91sam9261ek/at91sam9261ek.c index a89cb8b..9d31324 100644 --- a/board/atmel/at91sam9261ek/at91sam9261ek.c +++ b/board/atmel/at91sam9261ek/at91sam9261ek.c @@ -215,7 +215,9 @@ int board_init(void) #ifdef CONFIG_CMD_NAND at91sam9261ek_nand_hw_init(); #endif -#ifdef CONFIG_HAS_DATAFLASH +#if defined(CONFIG_ATMEL_SPI) + at91_spi0_hw_init((1 << 4) || (1 << 7)); +#elif defined(CONFIG_HAS_DATAFLASH) at91_spi0_hw_init(1 << 0); #endif #ifdef CONFIG_DRIVER_DM9000 @@ -246,3 +248,39 @@ void reset_phy(void) #endif } #endif + +/* SPI chip select control */ +#ifdef CONFIG_ATMEL_SPI +#include <spi.h> + +int spi_cs_is_valid(unsigned int bus, unsigned int cs) +{ + return bus == 0 && (cs == 0 || cs == 3); +} + +void spi_cs_activate(struct spi_slave *slave) +{ + switch(slave->cs) { + case 3: + at91_set_gpio_value(AT91_PIN_PA6, 0); + break; + case 0: + default: + at91_set_gpio_value(AT91_PIN_PA3, 0); + break; + } +} + +void spi_cs_deactivate(struct spi_slave *slave) +{ + switch(slave->cs) { + case 3: + at91_set_gpio_value(AT91_PIN_PA6, 1); + break; + case 0: + default: + at91_set_gpio_value(AT91_PIN_PA3, 1); + break; + } +} +#endif /* CONFIG_ATMEL_SPI */ diff --git a/board/atmel/at91sam9263ek/at91sam9263ek.c b/board/atmel/at91sam9263ek/at91sam9263ek.c index 57d5c95..e9c73af 100644 --- a/board/atmel/at91sam9263ek/at91sam9263ek.c +++ b/board/atmel/at91sam9263ek/at91sam9263ek.c @@ -236,10 +236,14 @@ int board_init(void) #ifdef CONFIG_CMD_NAND at91sam9263ek_nand_hw_init(); #endif -#ifdef CONFIG_HAS_DATAFLASH +#if defined(CONFIG_HAS_DATAFLASH) || defined(CONFIG_ATMEL_SPI) at91_set_gpio_output(AT91_PIN_PE20, 1); /* select spi0 clock */ +#if defined(CONFIG_ATMEL_SPI) + at91_spi0_hw_init(1 << 4); +#else at91_spi0_hw_init(1 << 0); #endif +#endif #ifdef CONFIG_MACB at91sam9263ek_macb_hw_init(); #endif @@ -280,3 +284,23 @@ int board_eth_init(bd_t *bis) #endif return rc; } + +/* SPI chip select control */ +#ifdef CONFIG_ATMEL_SPI +#include <spi.h> + +int spi_cs_is_valid(unsigned int bus, unsigned int cs) +{ + return bus == 0 && cs == 0; +} + +void spi_cs_activate(struct spi_slave *slave) +{ + at91_set_gpio_value(AT91_PIN_PA5, 0); +} + +void spi_cs_deactivate(struct spi_slave *slave) +{ + at91_set_gpio_value(AT91_PIN_PA5, 1); +} +#endif /* CONFIG_ATMEL_SPI */ diff --git a/board/atmel/at91sam9rlek/at91sam9rlek.c b/board/atmel/at91sam9rlek/at91sam9rlek.c index 7013ba2..35adfcd 100644 --- a/board/atmel/at91sam9rlek/at91sam9rlek.c +++ b/board/atmel/at91sam9rlek/at91sam9rlek.c @@ -188,7 +188,9 @@ int board_init(void) #ifdef CONFIG_CMD_NAND at91sam9rlek_nand_hw_init(); #endif -#ifdef CONFIG_HAS_DATAFLASH +#if defined(CONFIG_ATMEL_SPI) + at91_spi0_hw_init(1 << 4); +#elif defined(CONFIG_HAS_DATAFLASH) at91_spi0_hw_init(1 << 0); #endif #ifdef CONFIG_LCD @@ -203,3 +205,23 @@ int dram_init(void) gd->bd->bi_dram[0].size = PHYS_SDRAM_SIZE; return 0; } + +/* SPI chip select control */ +#ifdef CONFIG_ATMEL_SPI +#include <spi.h> + +int spi_cs_is_valid(unsigned int bus, unsigned int cs) +{ + return bus == 0 && cs == 0; +} + +void spi_cs_activate(struct spi_slave *slave) +{ + at91_set_gpio_value(AT91_PIN_PA28, 0); +} + +void spi_cs_deactivate(struct spi_slave *slave) +{ + at91_set_gpio_value(AT91_PIN_PA28, 1); +} +#endif /* CONFIG_ATMEL_SPI */ diff --git a/board/ronetix/pm9263/pm9263.c b/board/ronetix/pm9263/pm9263.c index 801b268..c16bea0 100644 --- a/board/ronetix/pm9263/pm9263.c +++ b/board/ronetix/pm9263/pm9263.c @@ -334,7 +334,9 @@ int board_init(void) #ifdef CONFIG_CMD_NAND pm9263_nand_hw_init(); #endif -#ifdef CONFIG_HAS_DATAFLASH +#if defined(CONFIG_ATMEL_SPI) + at91_spi0_hw_init(1 << 4); +#elif defined(CONFIG_HAS_DATAFLASH) at91_spi0_hw_init(1 << 0); #endif #ifdef CONFIG_MACB @@ -411,3 +413,23 @@ int checkboard (void) return 0; } #endif + +/* SPI chip select control */ +#ifdef CONFIG_ATMEL_SPI +#include <spi.h> + +int spi_cs_is_valid(unsigned int bus, unsigned int cs) +{ + return bus == 0 && cs == 0; +} + +void spi_cs_activate(struct spi_slave *slave) +{ + at91_set_gpio_value(AT91_PIN_PA5, 0); +} + +void spi_cs_deactivate(struct spi_slave *slave) +{ + at91_set_gpio_value(AT91_PIN_PA5, 1); +} +#endif /* CONFIG_ATMEL_SPI */ diff --git a/cpu/arm926ejs/at91/Makefile b/cpu/arm926ejs/at91/Makefile index fbc82d1..e73f450 100644 --- a/cpu/arm926ejs/at91/Makefile +++ b/cpu/arm926ejs/at91/Makefile @@ -28,30 +28,36 @@ LIB = $(obj)lib$(SOC).a ifdef CONFIG_AT91CAP9 COBJS-$(CONFIG_MACB) += at91cap9_macb.o COBJS-y += at91cap9_serial.o +COBJS-$(CONFIG_ATMEL_SPI) += at91cap9_spi.o COBJS-$(CONFIG_HAS_DATAFLASH) += at91cap9_spi.o endif ifdef CONFIG_AT91SAM9260 COBJS-$(CONFIG_MACB) += at91sam9260_macb.o COBJS-y += at91sam9260_serial.o +COBJS-$(CONFIG_ATMEL_SPI) += at91sam9260_spi.o COBJS-$(CONFIG_HAS_DATAFLASH) += at91sam9260_spi.o endif ifdef CONFIG_AT91SAM9G20 COBJS-$(CONFIG_MACB) += at91sam9260_macb.o COBJS-y += at91sam9260_serial.o +COBJS-$(CONFIG_ATMEL_SPI) += at91sam9260_spi.o COBJS-$(CONFIG_HAS_DATAFLASH) += at91sam9260_spi.o endif ifdef CONFIG_AT91SAM9261 COBJS-y += at91sam9261_serial.o +COBJS-$(CONFIG_ATMEL_SPI) += at91sam9261_spi.o COBJS-$(CONFIG_HAS_DATAFLASH) += at91sam9261_spi.o endif ifdef CONFIG_AT91SAM9263 COBJS-$(CONFIG_MACB) += at91sam9263_macb.o COBJS-y += at91sam9263_serial.o +COBJS-$(CONFIG_ATMEL_SPI) += at91sam9263_spi.o COBJS-$(CONFIG_HAS_DATAFLASH) += at91sam9263_spi.o COBJS-$(CONFIG_USB_OHCI_NEW) += at91sam9263_usb.o endif ifdef CONFIG_AT91SAM9RL COBJS-y += at91sam9rl_serial.o +COBJS-$(CONFIG_ATMEL_SPI) += at91sam9rl_spi.o COBJS-$(CONFIG_HAS_DATAFLASH) += at91sam9rl_spi.o endif COBJS-$(CONFIG_AT91_LED) += led.o diff --git a/include/asm-arm/arch-at91/clk.h b/include/asm-arm/arch-at91/clk.h index 6aaf82e..f642dd9 100644 --- a/include/asm-arm/arch-at91/clk.h +++ b/include/asm-arm/arch-at91/clk.h @@ -49,6 +49,11 @@ static inline unsigned long get_lcdc_clk_rate(unsigned int dev_id) return get_mck_clk_rate(); } +static inline unsigned long get_spi_clk_rate(unsigned int dev_id) +{ + return get_mck_clk_rate(); +} + static inline unsigned long get_twi_clk_rate(unsigned int dev_id) { return get_mck_clk_rate(); diff --git a/include/asm-arm/arch-at91/hardware.h b/include/asm-arm/arch-at91/hardware.h index 8704106..0403b09 100644 --- a/include/asm-arm/arch-at91/hardware.h +++ b/include/asm-arm/arch-at91/hardware.h @@ -21,25 +21,34 @@ #elif defined(CONFIG_AT91SAM9260) || defined(CONFIG_AT91SAM9G20) #include <asm/arch/at91sam9260.h> #define AT91_BASE_SPI AT91SAM9260_BASE_SPI0 +#define SPI0_BASE AT91SAM9260_BASE_SPI0 +#define SPI1_BASE AT91SAM9260_BASE_SPI1 #define AT91_ID_UHP AT91SAM9260_ID_UHP #define AT91_PMC_UHP AT91SAM926x_PMC_UHP #elif defined(CONFIG_AT91SAM9261) #include <asm/arch/at91sam9261.h> #define AT91_BASE_SPI AT91SAM9261_BASE_SPI0 +#define SPI0_BASE AT91SAM9261_BASE_SPI0 +#define SPI1_BASE AT91SAM9261_BASE_SPI1 #define AT91_ID_UHP AT91SAM9261_ID_UHP #define AT91_PMC_UHP AT91SAM926x_PMC_UHP #elif defined(CONFIG_AT91SAM9263) #include <asm/arch/at91sam9263.h> #define AT91_BASE_SPI AT91SAM9263_BASE_SPI0 +#define SPI0_BASE AT91SAM9263_BASE_SPI0 +#define SPI1_BASE AT91SAM9263_BASE_SPI1 #define AT91_ID_UHP AT91SAM9263_ID_UHP #define AT91_PMC_UHP AT91SAM926x_PMC_UHP #elif defined(CONFIG_AT91SAM9RL) #include <asm/arch/at91sam9rl.h> #define AT91_BASE_SPI AT91SAM9RL_BASE_SPI +#define SPI0_BASE AT91SAM9RL_BASE_SPI #define AT91_ID_UHP AT91SAM9RL_ID_UHP #elif defined(CONFIG_AT91CAP9) #include <asm/arch/at91cap9.h> #define AT91_BASE_SPI AT91CAP9_BASE_SPI0 +#define SPI0_BASE AT91CAP9_BASE_SPI0 +#define SPI1_BASE AT91CAP9_BASE_SPI1 #define AT91_ID_UHP AT91CAP9_ID_UHP #define AT91_PMC_UHP AT91CAP9_PMC_UHP #elif defined(CONFIG_AT91X40) diff --git a/include/configs/afeb9260.h b/include/configs/afeb9260.h index 89b16fe..a897c62 100644 --- a/include/configs/afeb9260.h +++ b/include/configs/afeb9260.h @@ -84,6 +84,12 @@ #define PHYS_SDRAM_SIZE 0x04000000 /* 64 megs */ /* DataFlash */ +#ifdef CONFIG_ATMEL_SPI +#define CONFIG_CMD_SF +#define CONFIG_CMD_SPI +#define CONFIG_SPI_FLASH 1 +#define CONFIG_SPI_FLASH_ATMEL 1 +#else #define CONFIG_ATMEL_DATAFLASH_SPI #define CONFIG_HAS_DATAFLASH 1 #define CONFIG_SYS_SPI_WRITE_TOUT (5 * CONFIG_SYS_HZ) @@ -93,6 +99,7 @@ #define AT91_SPI_CLK 15000000 #define DATAFLASH_TCSS (0x1a << 16) #define DATAFLASH_TCHS (0x1 << 24) +#endif /* NAND flash */ #ifdef CONFIG_CMD_NAND diff --git a/include/configs/at91cap9adk.h b/include/configs/at91cap9adk.h index 749c5a9..758a779 100644 --- a/include/configs/at91cap9adk.h +++ b/include/configs/at91cap9adk.h @@ -103,6 +103,12 @@ #define PHYS_SDRAM_SIZE 0x04000000 /* 64 megs */ /* DataFlash */ +#ifdef CONFIG_ATMEL_SPI +#define CONFIG_CMD_SF +#define CONFIG_CMD_SPI +#define CONFIG_SPI_FLASH 1 +#define CONFIG_SPI_FLASH_ATMEL 1 +#else #define CONFIG_ATMEL_DATAFLASH_SPI #define CONFIG_HAS_DATAFLASH 1 #define CONFIG_SYS_SPI_WRITE_TOUT (5*CONFIG_SYS_HZ) @@ -111,6 +117,7 @@ #define AT91_SPI_CLK 15000000 #define DATAFLASH_TCSS (0x1a << 16) #define DATAFLASH_TCHS (0x1 << 24) +#endif /* NOR flash */ #define CONFIG_SYS_FLASH_CFI 1 diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h index 2e49455..240f888 100644 --- a/include/configs/at91sam9260ek.h +++ b/include/configs/at91sam9260ek.h @@ -97,6 +97,12 @@ #define PHYS_SDRAM_SIZE 0x04000000 /* 64 megs */ /* DataFlash */ +#ifdef CONFIG_ATMEL_SPI +#define CONFIG_CMD_SF +#define CONFIG_CMD_SPI +#define CONFIG_SPI_FLASH 1 +#define CONFIG_SPI_FLASH_ATMEL 1 +#else #define CONFIG_ATMEL_DATAFLASH_SPI #define CONFIG_HAS_DATAFLASH 1 #define CONFIG_SYS_SPI_WRITE_TOUT (5*CONFIG_SYS_HZ) @@ -111,6 +117,7 @@ #define DATAFLASH_TCSS (0x1a << 16) #endif #define DATAFLASH_TCHS (0x1 << 24) +#endif /* NAND flash */ #ifdef CONFIG_CMD_NAND diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h index b890912..f2843b7 100644 --- a/include/configs/at91sam9261ek.h +++ b/include/configs/at91sam9261ek.h @@ -104,6 +104,12 @@ #define PHYS_SDRAM_SIZE 0x04000000 /* 64 megs */ /* DataFlash */ +#ifdef CONFIG_ATMEL_SPI +#define CONFIG_CMD_SF +#define CONFIG_CMD_SPI +#define CONFIG_SPI_FLASH 1 +#define CONFIG_SPI_FLASH_ATMEL 1 +#else #define CONFIG_ATMEL_DATAFLASH_SPI #define CONFIG_HAS_DATAFLASH 1 #define CONFIG_SYS_SPI_WRITE_TOUT (5*CONFIG_SYS_HZ) @@ -113,6 +119,7 @@ #define AT91_SPI_CLK 15000000 #define DATAFLASH_TCSS (0x1a << 16) #define DATAFLASH_TCHS (0x1 << 24) +#endif /* NAND flash */ #ifdef CONFIG_CMD_NAND diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h index d86f2c5..3d035fc 100644 --- a/include/configs/at91sam9263ek.h +++ b/include/configs/at91sam9263ek.h @@ -104,6 +104,12 @@ #define PHYS_SDRAM_SIZE 0x04000000 /* 64 megs */ /* DataFlash */ +#ifdef CONFIG_ATMEL_SPI +#define CONFIG_CMD_SF +#define CONFIG_CMD_SPI +#define CONFIG_SPI_FLASH 1 +#define CONFIG_SPI_FLASH_ATMEL 1 +#else #define CONFIG_ATMEL_DATAFLASH_SPI #define CONFIG_HAS_DATAFLASH 1 #define CONFIG_SYS_SPI_WRITE_TOUT (5*CONFIG_SYS_HZ) @@ -112,6 +118,7 @@ #define AT91_SPI_CLK 15000000 #define DATAFLASH_TCSS (0x1a << 16) #define DATAFLASH_TCHS (0x1 << 24) +#endif /* NOR flash, if populated */ #if 1 diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h index 728f73f..386e7c0 100644 --- a/include/configs/at91sam9rlek.h +++ b/include/configs/at91sam9rlek.h @@ -95,6 +95,12 @@ #define PHYS_SDRAM_SIZE 0x04000000 /* 64 megs */ /* DataFlash */ +#ifdef CONFIG_ATMEL_SPI +#define CONFIG_CMD_SF +#define CONFIG_CMD_SPI +#define CONFIG_SPI_FLASH 1 +#define CONFIG_SPI_FLASH_ATMEL 1 +#else #define CONFIG_ATMEL_DATAFLASH_SPI #define CONFIG_HAS_DATAFLASH 1 #define CONFIG_SYS_SPI_WRITE_TOUT (5*CONFIG_SYS_HZ) @@ -103,6 +109,7 @@ #define AT91_SPI_CLK 15000000 #define DATAFLASH_TCSS (0x1a << 16) #define DATAFLASH_TCHS (0x1 << 24) +#endif /* NOR flash - not present */ #define CONFIG_SYS_NO_FLASH 1 diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h index 9ae737f..33e320c 100644 --- a/include/configs/pm9263.h +++ b/include/configs/pm9263.h @@ -184,6 +184,12 @@ #define PHYS_SDRAM_SIZE 0x04000000 /* 64 megs */ /* DataFlash */ +#ifdef CONFIG_ATMEL_SPI +#define CONFIG_CMD_SF +#define CONFIG_CMD_SPI +#define CONFIG_SPI_FLASH 1 +#define CONFIG_SPI_FLASH_ATMEL 1 +#else #define CONFIG_ATMEL_DATAFLASH_SPI #define CONFIG_HAS_DATAFLASH 1 #define CONFIG_SYS_SPI_WRITE_TOUT (5 * CONFIG_SYS_HZ) @@ -192,6 +198,7 @@ #define AT91_SPI_CLK 15000000 #define DATAFLASH_TCSS (0x1a << 16) #define DATAFLASH_TCHS (0x1 << 24) +#endif /* NOR flash, if populated */ #define CONFIG_SYS_FLASH_CFI 1 -- 1.6.1.3

2 3

[U-Boot] [PATCH] Small fix to m5282evb
by Alan Carvalho de Assis 04 Apr '09

04 Apr '09

This is just a small fix to get u-boot on m5282evb. Signed-off-by: Alan Carvalho de Assis <acassis(a)gmail.com> --- board/freescale/m5282evb/u-boot.lds | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/board/freescale/m5282evb/u-boot.lds b/board/freescale/m5282evb/u-boot.lds index dc18b7d..f46e025 100644 --- a/board/freescale/m5282evb/u-boot.lds +++ b/board/freescale/m5282evb/u-boot.lds @@ -61,7 +61,7 @@ SECTIONS lib_generic/vsprintf.o (.text) lib_generic/crc32.o (.text) - . = env_offset; + . = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o(.text) *(.text) -- 1.5.6.3

2 1

[U-Boot] [PATCH] UBIFS: add R/O compatibility
by Stefan Roese 04 Apr '09

04 Apr '09

From: Artem Bityutskiy <Artem.Bityutskiy(a)nokia.com> From: Artem Bityutskiy <Artem.Bityutskiy(a)nokia.com> Now UBIFS is supported by u-boot. If we ever decide to change the media format, then people will have to upgrade their u-boots to mount new format images. However, very often it is possible to preserve R/O forward-compatibility, even though the write forward-compatibility is not preserved. This patch introduces a new super-block field which stores the R/O compatibility version. Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy(a)nokia.com> Acked-by: Adrian Hunter <Adrian.Hunter(a)nokia.com> Signed-off-by: Stefan Roese <sr(a)denx.de> --- fs/ubifs/sb.c | 34 ++++++++++++++++++++++++++++------ fs/ubifs/super.c | 14 ++++++++++++-- fs/ubifs/ubifs-media.h | 30 +++++++++++++++++++++++++++--- fs/ubifs/ubifs.h | 4 ++++ 4 files changed, 71 insertions(+), 11 deletions(-) diff --git a/fs/ubifs/sb.c b/fs/ubifs/sb.c index 9708fda..00c9cd3 100644 --- a/fs/ubifs/sb.c +++ b/fs/ubifs/sb.c @@ -235,17 +235,39 @@ int ubifs_read_superblock(struct ubifs_info *c) if (IS_ERR(sup)) return PTR_ERR(sup); + c->fmt_version = le32_to_cpu(sup->fmt_version); + c->ro_compat_version = le32_to_cpu(sup->ro_compat_version); + /* * The software supports all previous versions but not future versions, * due to the unavailability of time-travelling equipment. */ - c->fmt_version = le32_to_cpu(sup->fmt_version); if (c->fmt_version > UBIFS_FORMAT_VERSION) { - ubifs_err("on-flash format version is %d, but software only " - "supports up to version %d", c->fmt_version, - UBIFS_FORMAT_VERSION); - err = -EINVAL; - goto out; + struct super_block *sb = c->vfs_sb; + int mounting_ro = sb->s_flags & MS_RDONLY; + + ubifs_assert(!c->ro_media || mounting_ro); + if (!mounting_ro || + c->ro_compat_version > UBIFS_RO_COMPAT_VERSION) { + ubifs_err("on-flash format version is w%d/r%d, but " + "software only supports up to version " + "w%d/r%d", c->fmt_version, + c->ro_compat_version, UBIFS_FORMAT_VERSION, + UBIFS_RO_COMPAT_VERSION); + if (c->ro_compat_version <= UBIFS_RO_COMPAT_VERSION) { + ubifs_msg("only R/O mounting is possible"); + err = -EROFS; + } else + err = -EINVAL; + goto out; + } + + /* + * The FS is mounted R/O, and the media format is + * R/O-compatible with the UBIFS implementation, so we can + * mount. + */ + c->rw_incompat = 1; } if (c->fmt_version < 3) { diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c index 95f2a41..391dea4 100644 --- a/fs/ubifs/super.c +++ b/fs/ubifs/super.c @@ -727,8 +727,9 @@ static int mount_ubifs(struct ubifs_info *c) x = (long long)c->log_lebs * c->leb_size + c->max_bud_bytes; ubifs_msg("journal size: %lld bytes (%lld KiB, %lld MiB, %d " "LEBs)", x, x >> 10, x >> 20, c->log_lebs + c->max_bud_cnt); - ubifs_msg("media format: %d (latest is %d)", - c->fmt_version, UBIFS_FORMAT_VERSION); + ubifs_msg("media format: w%d/r%d (latest is w%d/r%d)", + c->fmt_version, c->ro_compat_version, + UBIFS_FORMAT_VERSION, UBIFS_RO_COMPAT_VERSION); ubifs_msg("default compressor: %s", ubifs_compr_name(c->default_compr)); ubifs_msg("reserved for root: %llu bytes (%llu KiB)", c->report_rp_size, c->report_rp_size >> 10); @@ -967,6 +968,15 @@ static int ubifs_fill_super(struct super_block *sb, void *data, int silent) if (c->max_inode_sz > MAX_LFS_FILESIZE) sb->s_maxbytes = c->max_inode_sz = MAX_LFS_FILESIZE; + if (c->rw_incompat) { + ubifs_err("the file-system is not R/W-compatible"); + ubifs_msg("on-flash format version is w%d/r%d, but software " + "only supports up to version w%d/r%d", c->fmt_version, + c->ro_compat_version, UBIFS_FORMAT_VERSION, + UBIFS_RO_COMPAT_VERSION); + return -EROFS; + } + mutex_lock(&c->umount_mutex); err = mount_ubifs(c); if (err) { diff --git a/fs/ubifs/ubifs-media.h b/fs/ubifs/ubifs-media.h index b25fc36..3eee07e 100644 --- a/fs/ubifs/ubifs-media.h +++ b/fs/ubifs/ubifs-media.h @@ -36,9 +36,31 @@ /* UBIFS node magic number (must not have the padding byte first or last) */ #define UBIFS_NODE_MAGIC 0x06101831 -/* UBIFS on-flash format version */ +/* + * UBIFS on-flash format version. This version is increased when the on-flash + * format is changing. If this happens, UBIFS is will support older versions as + * well. But older UBIFS code will not support newer formats. Format changes + * will be rare and only when absolutely necessary, e.g. to fix a bug or to add + * a new feature. + * + * UBIFS went into mainline kernel with format version 4. The older formats + * were development formats. + */ #define UBIFS_FORMAT_VERSION 4 +/* + * Read-only compatibility version. If the UBIFS format is changed, older UBIFS + * implementations will not be able to mount newer formats in read-write mode. + * However, depending on the change, it may be possible to mount newer formats + * in R/O mode. This is indicated by the R/O compatibility version which is + * stored in the super-block. + * + * This is needed to support boot-loaders which only need R/O mounting. With + * this flag it is possible to do UBIFS format changes without a need to update + * boot-loaders. + */ +#define UBIFS_RO_COMPAT_VERSION 0 + /* Minimum logical eraseblock size in bytes */ #define UBIFS_MIN_LEB_SZ (15*1024) @@ -53,7 +75,7 @@ /* * If compressed data length is less than %UBIFS_MIN_COMPRESS_DIFF bytes - * shorter than uncompressed data length, UBIFS preferes to leave this data + * shorter than uncompressed data length, UBIFS prefers to leave this data * node uncompress, because it'll be read faster. */ #define UBIFS_MIN_COMPRESS_DIFF 64 @@ -586,6 +608,7 @@ struct ubifs_pad_node { * @padding2: reserved for future, zeroes * @time_gran: time granularity in nanoseconds * @uuid: UUID generated when the file system image was created + * @ro_compat_version: UBIFS R/O compatibility version */ struct ubifs_sb_node { struct ubifs_ch ch; @@ -612,7 +635,8 @@ struct ubifs_sb_node { __le64 rp_size; __le32 time_gran; __u8 uuid[16]; - __u8 padding2[3972]; + __le32 ro_compat_version; + __u8 padding2[3968]; } __attribute__ ((packed)); /** diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h index f342dd8..91351de 100644 --- a/fs/ubifs/ubifs.h +++ b/fs/ubifs/ubifs.h @@ -1386,6 +1386,7 @@ struct ubifs_debug_info; * by @commit_sem * @cnt_lock: protects @highest_inum and @max_sqnum counters * @fmt_version: UBIFS on-flash format version + * @ro_compat_version: R/O compatibility version * @uuid: UUID from super block * * @lhead_lnum: log head logical eraseblock number @@ -1418,6 +1419,7 @@ struct ubifs_debug_info; * recovery) * @bulk_read: enable bulk-reads * @default_compr: default compression algorithm (%UBIFS_COMPR_LZO, etc) + * @rw_incompat: the media is not R/W compatible * * @tnc_mutex: protects the Tree Node Cache (TNC), @zroot, @cnext, @enext, and * @calc_idx_sz @@ -1628,6 +1630,7 @@ struct ubifs_info { unsigned long long cmt_no; spinlock_t cnt_lock; int fmt_version; + int ro_compat_version; unsigned char uuid[16]; int lhead_lnum; @@ -1656,6 +1659,7 @@ struct ubifs_info { unsigned int no_chk_data_crc:1; unsigned int bulk_read:1; unsigned int default_compr:2; + unsigned int rw_incompat:1; struct mutex tnc_mutex; struct ubifs_zbranch zroot; -- 1.6.2.1

2 1

[U-Boot] [PATCH] more command usage cleanup
by Mike Frysinger 04 Apr '09

04 Apr '09

Fix up a few dangling commands like in "Command usage cleanup" commit. Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> --- common/cmd_mmc.c | 2 +- common/cmd_ubifs.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/cmd_mmc.c b/common/cmd_mmc.c index 16c919b..ee94470 100644 --- a/common/cmd_mmc.c +++ b/common/cmd_mmc.c @@ -166,7 +166,7 @@ int do_mmcops(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) U_BOOT_CMD( mmc, 6, 1, do_mmcops, - "mmc - MMC sub system\n", + "MMC sub system", "mmc read <device num> addr blk# cnt\n" "mmc write <device num> addr blk# cnt\n" "mmc rescan <device num>\n" diff --git a/common/cmd_ubifs.c b/common/cmd_ubifs.c index b2e0f4f..4767aa4 100644 --- a/common/cmd_ubifs.c +++ b/common/cmd_ubifs.c @@ -118,15 +118,15 @@ int do_ubifs_load(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) U_BOOT_CMD( ubifsmount, 2, 0, do_ubifs_mount, - "ubifsmount- mount UBIFS volume\n", + "mount UBIFS volume", "\n"); U_BOOT_CMD(ubifsls, 2, 0, do_ubifs_ls, - "ubifsls - list files in a directory\n", + "list files in a directory", "[directory]\n" " - list files in a 'directory' (default '/')\n"); U_BOOT_CMD(ubifsload, 4, 0, do_ubifs_load, - "ubifsload- load file from an UBIFS filesystem\n", + "load file from an UBIFS filesystem", "<addr> <filename> [bytes]\n" " - load file 'filename' to address 'addr'\n"); -- 1.6.2

2 1

[U-Boot] [PATCH] smc91111_eeprom: move board-specific init into SMC91111_EEPROM_INIT()
by Mike Frysinger 04 Apr '09

04 Apr '09

Rather than sticking Blackfin-specific stuff into the eeprom example, use an indirect macro so that any board can override it with their own magic sauce in their board config file. Also fix some spurious semi-colons in defines while I'm at it ... Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> CC: Ben Warren <biggerbadderben(a)gmail.com> --- examples/smc91111_eeprom.c | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/examples/smc91111_eeprom.c b/examples/smc91111_eeprom.c index 62347c7..39e5306 100644 --- a/examples/smc91111_eeprom.c +++ b/examples/smc91111_eeprom.c @@ -33,15 +33,14 @@ #ifdef CONFIG_DRIVER_SMC91111 -#ifdef pFIO0_DIR -# define pFIO_DIR pFIO0_DIR -# define pFIO_FLAG_S pFIO0_FLAG_S +#ifndef SMC91111_EEPROM_INIT +# define SMC91111_EEPROM_INIT() #endif #define SMC_BASE_ADDRESS CONFIG_SMC91111_BASE -#define EEPROM 0x1; -#define MAC 0x2; -#define UNKNOWN 0x4; +#define EEPROM 0x1 +#define MAC 0x2 +#define UNKNOWN 0x4 void dump_reg (void); void dump_eeprom (void); @@ -66,9 +65,7 @@ int smc91111_eeprom (int argc, char *argv[]) return (0); } - *pFIO_DIR = 0x01; - *pFIO_FLAG_S = 0x01; - SSYNC(); + SMC91111_EEPROM_INIT(); if ((SMC_inw (BANK_SELECT) & 0xFF00) != 0x3300) { printf ("Can't find SMSC91111\n"); -- 1.6.2

2 1

[U-Boot] [PATCH 0/3] Three mpc5200 patches from Pengutronix.de
by Jon 04 Apr '09

04 Apr '09

Three generic mpc5200 patches from Pengutronix.de that missed being submitted to mainline. --- Sascha Hauer (3): mpc5200: make i2c faster mpc52xx phy: initialize only when needed mpc5200: do not use printf in i2c_init() cpu/mpc5xxx/i2c.c | 16 +++------------- drivers/net/mpc5xxx_fec.c | 11 +++++++++-- 2 files changed, 12 insertions(+), 15 deletions(-) -- Jon Smirl jonsmirl(a)gmail.com

7 28

[U-Boot] [PATCH] ARM: fix out-of-tree build of imx31_phycore_eet, add to MAINTAINERS
by Guennadi Liakhovetski 04 Apr '09

04 Apr '09

Fix out-of-tree build of the imx31_phycore_eet target, add it to the list of boards, maintained by me, in MAINTAINERS. Reported-by: Wolfgang Denk <wd(a)denx.de> Signed-off-by: Guennadi Liakhovetski <lg(a)denx.de> --- diff --git a/MAINTAINERS b/MAINTAINERS index 284f5c6..4b1b187 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -568,8 +568,9 @@ Prakash Kumar <prakash(a)embedx.com> Guennadi Liakhovetski <g.liakhovetski(a)gmx.de> - mx31ads i.MX31 - SMDK6400 S3C6400 + mx31ads i.MX31 + imx31_phycore_eet i.MX31 + SMDK6400 S3C6400 Nishanth Menon <nm(a)ti.com> diff --git a/Makefile b/Makefile index f9edd9d..86e6d62 100644 --- a/Makefile +++ b/Makefile @@ -3066,6 +3066,7 @@ imx31_litekit_config : unconfig imx31_phycore_eet_config \ imx31_phycore_config : unconfig + @mkdir -p $(obj)include @if [ -n "$(findstring _eet_,$@)" ]; then \ echo "#define CONFIG_IMX31_PHYCORE_EET" >> $(obj)include/config.h; \ fi

2 1