January 2012 - U-Boot

[U-Boot] [PATCH 0/2] Network support for Calxeda highbank
by Rob Herring 05 Jan '12

05 Jan '12

From: Rob Herring <rob.herring(a)calxeda.com> This series adds the Calxeda xgmac ethernet driver and enables networking options on the highbank platform. Rob Rob Herring (2): net: add Calxeda xgmac driver ARM: highbank: enable networking and pxe README | 6 + board/highbank/highbank.c | 14 ++ drivers/net/Makefile | 1 + drivers/net/calxedaxgmac.c | 552 ++++++++++++++++++++++++++++++++++++++++++++ include/configs/highbank.h | 19 ++- include/netdev.h | 1 + 6 files changed, 591 insertions(+), 2 deletions(-) create mode 100644 drivers/net/calxedaxgmac.c -- 1.7.5.4

3 22

[U-Boot] [PATCH 09/10] Correctly handle input files beginning with several newlines
by David Wagner 05 Jan '12

05 Jan '12

Also, fix some comments (minor) Signed-off-by: David Wagner <david.wagner(a)free-electrons.com> --- tools/mkenvimage.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/mkenvimage.c b/tools/mkenvimage.c index 9899631..0c9194b 100644 --- a/tools/mkenvimage.c +++ b/tools/mkenvimage.c @@ -224,18 +224,18 @@ int main(int argc, char **argv) /* Replace newlines separating variables with \0 */ for (fp = 0, ep = 0 ; fp < filesize ; fp++) { if (filebuf[fp] == '\n') { - if (fp == 0) { + if (ep == 0) { /* - * Newline at the beginning of the file ? - * Ignore it. + * Newlines at the beginning of the file ? + * Ignore them. */ continue; } else if (filebuf[fp-1] == '\\') { /* * Embedded newline in a variable. * - * The backslash was added to the envptr ; - * rewind and replace it with a newline + * The backslash was added to the envptr; rewind + * and replace it with a newline */ ep--; envptr[ep++] = '\n'; -- 1.7.5.4

2 1

[U-Boot] [PATCH v3] cmd_fat: add FAT write command
by Donggeun Kim 05 Jan '12

05 Jan '12

Once CONFIG_FAT_WRITE is defined, users can invoke 'fatwrite' command that saves data in RAM as a FAT file. By removing variable of 'part_size' in fs/fat.c, compile error occurs when enabling FAT write feature. The variable should be declared only when CONFIG_FAT_WRITE is defined. This patch also removes compile error when FAT write is enabled and compile warning when FAT write is disabled. Signed-off-by: Donggeun Kim <dg77.kim(a)samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park(a)samsung.com> --- Changes for v3: - use cmd_usage function Changes for v2: - merge the patch that fixes compile error when enabling FAT write - change do_fat_fswrite to be static function common/cmd_fat.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ fs/fat/fat.c | 7 ++++++ 2 files changed, 64 insertions(+), 0 deletions(-) diff --git a/common/cmd_fat.c b/common/cmd_fat.c index 0220494..fef1c82 100644 --- a/common/cmd_fat.c +++ b/common/cmd_fat.c @@ -184,3 +184,60 @@ U_BOOT_CMD( "<interface> <dev[:part]>\n" " - print information about filesystem from 'dev' on 'interface'" ); + +#ifdef CONFIG_FAT_WRITE +static int do_fat_fswrite(cmd_tbl_t *cmdtp, int flag, + int argc, char * const argv[]) +{ + long size; + unsigned long addr; + unsigned long count; + block_dev_desc_t *dev_desc = NULL; + int dev = 0; + int part = 1; + char *ep; + + if (argc < 5) + return cmd_usage(cmdtp); + + dev = (int)simple_strtoul(argv[2], &ep, 16); + dev_desc = get_dev(argv[1], dev); + if (dev_desc == NULL) { + puts("\n** Invalid boot device **\n"); + return 1; + } + if (*ep) { + if (*ep != ':') { + puts("\n** Invalid boot device, use `dev[:part]' **\n"); + return 1; + } + part = (int)simple_strtoul(++ep, NULL, 16); + } + if (fat_register_device(dev_desc, part) != 0) { + printf("\n** Unable to use %s %d:%d for fatwrite **\n", + argv[1], dev, part); + return 1; + } + addr = simple_strtoul(argv[3], NULL, 16); + count = simple_strtoul(argv[5], NULL, 16); + + size = file_fat_write(argv[4], (void *)addr, count); + if (size == -1) { + printf("\n** Unable to write \"%s\" from %s %d:%d **\n", + argv[4], argv[1], dev, part); + return 1; + } + + printf("%ld bytes write\n", size); + + return 0; +} + +U_BOOT_CMD( + fatwrite, 6, 0, do_fat_fswrite, + "write file into a dos filesystem", + "<interface> <dev[:part]> <addr> <filename> <bytes>\n" + " - write file 'filename' from the address 'addr' in RAM\n" + " to 'dev' on 'interface'" +); +#endif diff --git a/fs/fat/fat.c b/fs/fat/fat.c index 9a29458..40c0538 100644 --- a/fs/fat/fat.c +++ b/fs/fat/fat.c @@ -47,6 +47,10 @@ static block_dev_desc_t *cur_dev = NULL; static unsigned long part_offset = 0; +#ifdef CONFIG_FAT_WRITE +static unsigned long part_size; +#endif + static int cur_part = 1; #define DOS_PART_TBL_OFFSET 0x1be @@ -101,6 +105,9 @@ int fat_register_device (block_dev_desc_t * dev_desc, int part_no) if (!get_partition_info(dev_desc, part_no, &info)) { part_offset = info.start; cur_part = part_no; +#ifdef CONFIG_FAT_WRITE + part_size = info.size; +#endif } else if ((strncmp((char *)&buffer[DOS_FS_TYPE_OFFSET], "FAT", 3) == 0) || (strncmp((char *)&buffer[DOS_FS32_TYPE_OFFSET], -- 1.7.4.1

2 1

[U-Boot] [PATCH] FAT: update the second FAT when writing a file
by Donggeun Kim 05 Jan '12

05 Jan '12

After susccessful write to the FAT partition, fsck program may print warning message due to different FAT, provided that the filesystem supports two FATs. This patch makes the second FAT to be same with the first one when writing a file. Signed-off-by: Donggeun Kim <dg77.kim(a)samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park(a)samsung.com> --- fs/fat/fat_write.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/fs/fat/fat_write.c b/fs/fat/fat_write.c index 4f1772f..9e34def 100644 --- a/fs/fat/fat_write.c +++ b/fs/fat/fat_write.c @@ -112,6 +112,7 @@ static void set_name(dir_entry *dirent, const char *filename) debug("ext : %s\n", dirent->ext); } +static __u8 num_of_fats; /* * Write fat buffer into block device */ @@ -134,6 +135,15 @@ static int flush_fat_buffer(fsdata *mydata) return -1; } + if (num_of_fats == 2) { + /* Update corresponding second FAT blocks */ + startblock += mydata->fatlength; + if (disk_write(startblock, getsize, bufptr) < 0) { + debug("error: writing second FAT blocks\n"); + return -1; + } + } + return 0; } @@ -949,6 +959,7 @@ static int do_fat_write(const char *filename, void *buffer, cursect = mydata->rootdir_sect = mydata->fat_sect + mydata->fatlength * bs.fats; + num_of_fats = bs.fats; mydata->sect_size = (bs.sector_size[1] << 8) + bs.sector_size[0]; mydata->clust_size = bs.cluster_size; -- 1.7.4.1

2 1

[U-Boot] [PATCH] avoid flash writes for new keys, with no values with fw_setenv
by Sridhar Addagada 05 Jan '12

05 Jan '12

This will avoid flash writes for fw_setenv command where the key is not present the environment and no value has been provided. Signed-off-by: Sridhar Addagada <sridhar_a(a)yahoo.com> --- tools/env/fw_env.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c index 996682e..68597a5 100644 --- a/tools/env/fw_env.c +++ b/tools/env/fw_env.c @@ -366,7 +366,7 @@ int fw_env_close(void) */ int fw_env_write(char *name, char *value) { - int len; + int len, found = 0; char *env, *nxt; char *oldval = NULL; @@ -415,7 +415,7 @@ int fw_env_write(char *name, char *value) /* Delete only ? */ if (!value || !strlen(value)) - return 0; + return (found ? 0 : -1); /* * Append new definition at the end @@ -460,7 +460,7 @@ int fw_env_write(char *name, char *value) */ int fw_setenv(int argc, char *argv[]) { - int i, len; + int r, i, len; char *name; char *value = NULL; char *tmpval = NULL; @@ -501,12 +501,13 @@ int fw_setenv(int argc, char *argv[]) *tmpval++ = *val++; } - fw_env_write(name, value); + r = fw_env_write(name, value); if (value) free(value); - return fw_env_close(); + // avoid flash write for new keys, with no values. + return ((-1 == r) ? r : fw_env_close()); } /* -- 1.7.3.GIT

2 1

[U-Boot] [PATCH] ext2: Cache line align indirection buffers
by Simon Glass 05 Jan '12

05 Jan '12

Make ext2 use cache line aligned buffers for reading from the filesystem. This is needed when caches are enabled because unaligned cache invalidates are not safe. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- fs/ext2/ext2fs.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/fs/ext2/ext2fs.c b/fs/ext2/ext2fs.c index e119e13..f621741 100644 --- a/fs/ext2/ext2fs.c +++ b/fs/ext2/ext2fs.c @@ -265,7 +265,8 @@ static int ext2fs_read_block (ext2fs_node_t node, int fileblock) { /* Indirect. */ else if (fileblock < (INDIRECT_BLOCKS + (blksz / 4))) { if (indir1_block == NULL) { - indir1_block = (uint32_t *) malloc (blksz); + indir1_block = (uint32_t *) memalign(ARCH_DMA_MINALIGN, + blksz); if (indir1_block == NULL) { printf ("** ext2fs read block (indir 1) malloc failed. **\n"); return (-1); @@ -278,7 +279,8 @@ static int ext2fs_read_block (ext2fs_node_t node, int fileblock) { indir1_block = NULL; indir1_size = 0; indir1_blkno = -1; - indir1_block = (uint32_t *) malloc (blksz); + indir1_block = (uint32_t *) memalign(ARCH_DMA_MINALIGN, + blksz); if (indir1_block == NULL) { printf ("** ext2fs read block (indir 1) malloc failed. **\n"); return (-1); @@ -309,7 +311,8 @@ static int ext2fs_read_block (ext2fs_node_t node, int fileblock) { + blksz / 4); if (indir1_block == NULL) { - indir1_block = (uint32_t *) malloc (blksz); + indir1_block = (uint32_t *) memalign(ARCH_DMA_MINALIGN, + blksz); if (indir1_block == NULL) { printf ("** ext2fs read block (indir 2 1) malloc failed. **\n"); return (-1); @@ -322,7 +325,8 @@ static int ext2fs_read_block (ext2fs_node_t node, int fileblock) { indir1_block = NULL; indir1_size = 0; indir1_blkno = -1; - indir1_block = (uint32_t *) malloc (blksz); + indir1_block = (uint32_t *) memalign(ARCH_DMA_MINALIGN, + blksz); if (indir1_block == NULL) { printf ("** ext2fs read block (indir 2 1) malloc failed. **\n"); return (-1); @@ -343,7 +347,8 @@ static int ext2fs_read_block (ext2fs_node_t node, int fileblock) { } if (indir2_block == NULL) { - indir2_block = (uint32_t *) malloc (blksz); + indir2_block = (uint32_t *) memalign(ARCH_DMA_MINALIGN, + blksz); if (indir2_block == NULL) { printf ("** ext2fs read block (indir 2 2) malloc failed. **\n"); return (-1); @@ -356,7 +361,8 @@ static int ext2fs_read_block (ext2fs_node_t node, int fileblock) { indir2_block = NULL; indir2_size = 0; indir2_blkno = -1; - indir2_block = (uint32_t *) malloc (blksz); + indir2_block = (uint32_t *) memalign(ARCH_DMA_MINALIGN, + blksz); if (indir2_block == NULL) { printf ("** ext2fs read block (indir 2 2) malloc failed. **\n"); return (-1); -- 1.7.3.1

2 1

[U-Boot] Pull request: u-boot-arm/master
by Albert ARIBAUD 05 Jan '12

05 Jan '12

Hi Wolfgang, Following the opening of the merge window, the following changes since commit bfcc40bb09b05c90cc3b1496abb270eb8aa72134: Merge branch 'next' of ../next (2011-12-23 20:53:58 +0100) are available in the git repository at: git://git.denx.de/u-boot-arm.git master Christian Riesch (7): spl: display_options.o is required for SPI flash support in SPL sf: Add spi_boot() to allow booting from SPI flash in an SPL arm, davinci: Add SPL support for DA850 SoCs arm, da850evm: Add an SPL for SPI boot mkimage: Fix variable length header support arm, davinci: Add support for generating AIS images to the Makefile arm, davinci: Fix build warnings for cam_enc_4xx Fabio Estevam (1): vision2: Fix checkpatch warning Simon Glass (14): tegra2: Tidy UART selection tegra2: Add UARTB support tegra2: config: Enable SPI flash on Seaboard tegra2: Enable SPI environment on Seaboard tegra2: Implement SPI / UART GPIO switch tegra2: spi: Support SPI / UART switch tegra2: Plumb in SPI/UART switch code tegra: Fix build error in plutux, medcom tegra: Move cpu_init_cp15() to arch_cpu_init() tegra: Move clock_early_init() to arch_cpu_init() tegra: add clock_ll_start_uart() to enable UART prior to reloc tegra: Add a function mux feature tegra: Add support for UART init in cpu board.c tegra: Move boards over to use arch-level board UART function Stefano Babic (2): ARM: omap3: added common configuration for Technexion TAM3517 ARM: omap3: add support to Technexion twister board Thierry Reding (7): tegra2: Always build with USE_PRIVATE_LIBGCC=yes. tegra2: Change CONFIG_SYS_TEXT_BASE to 0x00108000. tegra2: Move tegra2_mmc_init() prototype to public header. tegra2: Add common Avionic Design Tamonten support. tegra2: Add Avionic Design Plutux support. tegra2: Add Avionic Design Medcom support. tegra2: Optimize out-of-tree build for Ventana. Thomas Weber (1): Devkit8000: Switch over to enable_gpmc_cs_config Tom Warren (2): tegra2: spi: Add SPI driver for Tegra2 SOC arm: Tegra: Fix Harmony and Ventana builds in u-boot-tegra/master .gitignore | 1 + MAINTAINERS | 6 + Makefile | 13 + arch/arm/cpu/arm926ejs/davinci/Makefile | 3 +- arch/arm/cpu/arm926ejs/davinci/spl.c | 35 ++- arch/arm/cpu/armv7/tegra2/Makefile | 2 +- arch/arm/cpu/armv7/tegra2/board.c | 58 +++ arch/arm/cpu/armv7/tegra2/clock.c | 14 + arch/arm/cpu/armv7/tegra2/config.mk | 2 + arch/arm/cpu/armv7/tegra2/funcmux.c | 58 +++ arch/arm/include/asm/arch-tegra2/board.h | 30 ++ arch/arm/include/asm/arch-tegra2/clock.h | 11 + arch/arm/include/asm/arch-tegra2/funcmux.h | 41 ++ arch/arm/include/asm/arch-tegra2/mmc.h | 27 ++ arch/arm/include/asm/arch-tegra2/tegra2.h | 1 + arch/arm/include/asm/arch-tegra2/tegra2_spi.h | 76 ++++ arch/arm/include/asm/arch-tegra2/uart-spi-switch.h | 46 +++ board/avionic-design/common/tamonten.c | 116 ++++++ board/avionic-design/common/tamonten.h | 32 ++ board/avionic-design/medcom/Makefile | 50 +++ board/avionic-design/medcom/medcom.c | 45 +++ board/avionic-design/plutux/Makefile | 50 +++ board/avionic-design/plutux/plutux.c | 45 +++ board/davinci/da8xxevm/da850evm.c | 4 +- board/davinci/da8xxevm/u-boot-spl.lds | 73 ++++ board/nvidia/common/Makefile | 47 +++ board/nvidia/common/board.c | 73 +--- board/nvidia/common/board.h | 2 +- board/nvidia/common/uart-spi-switch.c | 138 +++++++ board/nvidia/harmony/Makefile | 1 - board/nvidia/harmony/harmony.c | 2 +- board/nvidia/seaboard/Makefile | 1 - board/nvidia/seaboard/seaboard.c | 5 +- board/nvidia/ventana/Makefile | 6 +- board/technexion/twister/Makefile | 38 ++ board/technexion/twister/twister.c | 116 ++++++ board/technexion/twister/twister.h | 411 ++++++++++++++++++++ board/timll/devkit8000/devkit8000.c | 19 +- board/ttcontrol/vision2/vision2.c | 3 +- boards.cfg | 3 + doc/README.SPL | 1 + doc/README.davinci | 9 + drivers/mmc/tegra2_mmc.h | 2 - drivers/mtd/spi/Makefile | 4 + drivers/mtd/spi/spi_spl_load.c | 58 +++ drivers/spi/Makefile | 1 + drivers/spi/tegra2_spi.c | 279 +++++++++++++ include/configs/da850evm.h | 87 ++++ include/configs/harmony.h | 3 + include/configs/medcom.h | 64 +++ include/configs/plutux.h | 64 +++ include/configs/seaboard.h | 20 + include/configs/tam3517-common.h | 361 +++++++++++++++++ include/configs/tegra2-common.h | 5 +- include/configs/twister.h | 54 +++ include/configs/ventana.h | 3 + include/spi_flash.h | 3 + lib/Makefile | 2 + tools/mkimage.c | 97 +++--- 59 files changed, 2687 insertions(+), 134 deletions(-) create mode 100644 arch/arm/cpu/armv7/tegra2/funcmux.c create mode 100644 arch/arm/include/asm/arch-tegra2/board.h create mode 100644 arch/arm/include/asm/arch-tegra2/funcmux.h create mode 100644 arch/arm/include/asm/arch-tegra2/mmc.h create mode 100644 arch/arm/include/asm/arch-tegra2/tegra2_spi.h create mode 100644 arch/arm/include/asm/arch-tegra2/uart-spi-switch.h create mode 100644 board/avionic-design/common/tamonten.c create mode 100644 board/avionic-design/common/tamonten.h create mode 100644 board/avionic-design/medcom/Makefile create mode 100644 board/avionic-design/medcom/medcom.c create mode 100644 board/avionic-design/plutux/Makefile create mode 100644 board/avionic-design/plutux/plutux.c create mode 100644 board/davinci/da8xxevm/u-boot-spl.lds create mode 100644 board/nvidia/common/Makefile create mode 100644 board/nvidia/common/uart-spi-switch.c create mode 100644 board/technexion/twister/Makefile create mode 100644 board/technexion/twister/twister.c create mode 100644 board/technexion/twister/twister.h create mode 100644 drivers/mtd/spi/spi_spl_load.c create mode 100644 drivers/spi/tegra2_spi.c create mode 100644 include/configs/medcom.h create mode 100644 include/configs/plutux.h create mode 100644 include/configs/tam3517-common.h create mode 100644 include/configs/twister.h Amicalement, -- Albert.

2 1

[U-Boot] [PATCH] tools/mkenvimage.c: Fix a merge issue
by Horst Kronstorfer 05 Jan '12

05 Jan '12

With bfcc40bb09b05c90cc3b1496abb270eb8aa72134 'optopt' was reverted. Signed-off-by: Horst Kronstorfer <hkronsto(a)frequentis.com> --- tools/mkenvimage.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/mkenvimage.c b/tools/mkenvimage.c index c5ed373..8ee2bd0 100644 --- a/tools/mkenvimage.c +++ b/tools/mkenvimage.c @@ -122,11 +122,11 @@ int main(int argc, char **argv) return EXIT_SUCCESS; case ':': fprintf(stderr, "Missing argument for option -%c\n", - option); + optopt); usage(argv[0]); return EXIT_FAILURE; default: - fprintf(stderr, "Wrong option -%c\n", option); + fprintf(stderr, "Wrong option -%c\n", optopt); usage(prg); return EXIT_FAILURE; } -- 1.7.7.4

3 3

[U-Boot] [PATCH] [trivial] env: remove value from boolean defines
by Igor Grinberg 05 Jan '12

05 Jan '12

Several boolean defines have a value assigned. Remove the value as defining the symbol is enough. Signed-off-by: Igor Grinberg <grinberg(a)compulab.co.il> --- include/environment.h | 8 ++++---- tools/envcrc.c | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/environment.h b/include/environment.h index 3c145af..1ef44f3 100644 --- a/include/environment.h +++ b/include/environment.h @@ -22,7 +22,7 @@ */ #ifndef _ENVIRONMENT_H_ -#define _ENVIRONMENT_H_ 1 +#define _ENVIRONMENT_H_ /************************************************************************** * @@ -64,10 +64,10 @@ # if (CONFIG_ENV_ADDR >= CONFIG_SYS_MONITOR_BASE) && \ (CONFIG_ENV_ADDR + CONFIG_ENV_SIZE) <= \ (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) -# define ENV_IS_EMBEDDED 1 +# define ENV_IS_EMBEDDED # endif # if defined(CONFIG_ENV_ADDR_REDUND) || defined(CONFIG_ENV_OFFSET_REDUND) -# define CONFIG_SYS_REDUNDAND_ENVIRONMENT 1 +# define CONFIG_SYS_REDUNDAND_ENVIRONMENT # endif # ifdef CONFIG_ENV_IS_EMBEDDED # error "do not define CONFIG_ENV_IS_EMBEDDED in your board config" @@ -120,7 +120,7 @@ extern unsigned long nand_env_oob_offset; * calculated automatically (i.e. NAND), take the board opt-in. */ #if defined(CONFIG_ENV_IS_EMBEDDED) && !defined(ENV_IS_EMBEDDED) -# define ENV_IS_EMBEDDED 1 +# define ENV_IS_EMBEDDED #endif /* The build system likes to know if the env is embedded */ diff --git a/tools/envcrc.c b/tools/envcrc.c index 51e3f54..08d2a8f 100644 --- a/tools/envcrc.c +++ b/tools/envcrc.c @@ -53,15 +53,15 @@ # endif # if (CONFIG_ENV_ADDR >= CONFIG_SYS_MONITOR_BASE) && \ ((CONFIG_ENV_ADDR + CONFIG_ENV_SIZE) <= (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)) -# define ENV_IS_EMBEDDED 1 +# define ENV_IS_EMBEDDED # endif # if defined(CONFIG_ENV_ADDR_REDUND) || defined(CONFIG_ENV_OFFSET_REDUND) -# define CONFIG_SYS_REDUNDAND_ENVIRONMENT 1 +# define CONFIG_SYS_REDUNDAND_ENVIRONMENT # endif #endif /* CONFIG_ENV_IS_IN_FLASH */ #if defined(ENV_IS_EMBEDDED) && !defined(CONFIG_BUILD_ENVCRC) -# define CONFIG_BUILD_ENVCRC 1 +# define CONFIG_BUILD_ENVCRC #endif #ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT -- 1.7.3.4

4 7

[U-Boot] [PATCH] env: factor out the env_get_char_spec() function
by Igor Grinberg 05 Jan '12

05 Jan '12

env_get_char_spec() function is duplicated across multiple environment files. Remove the duplication by providing a default implementation. Add "weak" declaration, so the default implementation can be overridden. Signed-off-by: Igor Grinberg <grinberg(a)compulab.co.il> --- common/env_common.c | 7 +++++++ common/env_flash.c | 5 ----- common/env_mgdisk.c | 5 ----- common/env_mmc.c | 5 ----- common/env_nand.c | 5 ----- common/env_nowhere.c | 5 ----- common/env_nvram.c | 6 ++---- common/env_onenand.c | 5 ----- common/env_sf.c | 5 ----- 9 files changed, 9 insertions(+), 39 deletions(-) diff --git a/common/env_common.c b/common/env_common.c index 8a71096..71811c4 100644 --- a/common/env_common.c +++ b/common/env_common.c @@ -124,6 +124,13 @@ const uchar default_environment[] = { struct hsearch_data env_htab; +static uchar __env_get_char_spec(int index) +{ + return *((uchar *)(gd->env_addr + index)); +} +uchar env_get_char_spec(int) + __attribute__((weak, alias("__env_get_char_spec"))); + static uchar env_get_char_init(int index) { /* if crc was bad, use the default environment */ diff --git a/common/env_flash.c b/common/env_flash.c index a99f850..aa970d4 100644 --- a/common/env_flash.c +++ b/common/env_flash.c @@ -73,11 +73,6 @@ static ulong end_addr_new = CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1; #endif /* CONFIG_ENV_ADDR_REDUND */ -uchar env_get_char_spec(int index) -{ - return *((uchar *)(gd->env_addr + index)); -} - #ifdef CONFIG_ENV_ADDR_REDUND int env_init(void) { diff --git a/common/env_mgdisk.c b/common/env_mgdisk.c index 5dd92e7..d00e141 100644 --- a/common/env_mgdisk.c +++ b/common/env_mgdisk.c @@ -33,11 +33,6 @@ env_t *env_ptr; DECLARE_GLOBAL_DATA_PTR; -uchar env_get_char_spec(int index) -{ - return *((uchar *)(gd->env_addr + index)); -} - void env_relocate_spec(void) { char buf[CONFIG_ENV_SIZE]; diff --git a/common/env_mmc.c b/common/env_mmc.c index 8441c77..0c58ae1 100644 --- a/common/env_mmc.c +++ b/common/env_mmc.c @@ -54,11 +54,6 @@ static int __mmc_get_env_addr(struct mmc *mmc, u32 *env_addr) int mmc_get_env_addr(struct mmc *mmc, u32 *env_addr) __attribute__((weak, alias("__mmc_get_env_addr"))); -uchar env_get_char_spec(int index) -{ - return *((uchar *)(gd->env_addr + index)); -} - int env_init(void) { /* use default */ diff --git a/common/env_nand.c b/common/env_nand.c index 3cb75c8..e8daec9 100644 --- a/common/env_nand.c +++ b/common/env_nand.c @@ -66,11 +66,6 @@ env_t *env_ptr; DECLARE_GLOBAL_DATA_PTR; -uchar env_get_char_spec(int index) -{ - return *((uchar *)(gd->env_addr + index)); -} - /* * This is called before nand_init() so we can't read NAND to * validate env data. diff --git a/common/env_nowhere.c b/common/env_nowhere.c index 8a3ca19..18fcf2c 100644 --- a/common/env_nowhere.c +++ b/common/env_nowhere.c @@ -37,11 +37,6 @@ void env_relocate_spec(void) { } -uchar env_get_char_spec(int index) -{ - return *((uchar *)(gd->env_addr + index)); -} - /* * Initialize Environment use * diff --git a/common/env_nvram.c b/common/env_nvram.c index 726eaac..6483db3 100644 --- a/common/env_nvram.c +++ b/common/env_nvram.c @@ -59,18 +59,16 @@ env_t *env_ptr = (env_t *)CONFIG_ENV_ADDR; char *env_name_spec = "NVRAM"; +#ifdef CONFIG_SYS_NVRAM_ACCESS_ROUTINE uchar env_get_char_spec(int index) { -#ifdef CONFIG_SYS_NVRAM_ACCESS_ROUTINE uchar c; nvram_read(&c, CONFIG_ENV_ADDR + index, 1); return c; -#else - return *((uchar *)(gd->env_addr + index)); -#endif } +#endif void env_relocate_spec(void) { diff --git a/common/env_onenand.c b/common/env_onenand.c index 0ad2fc7..652665a 100644 --- a/common/env_onenand.c +++ b/common/env_onenand.c @@ -44,11 +44,6 @@ char *env_name_spec = "OneNAND"; DECLARE_GLOBAL_DATA_PTR; -uchar env_get_char_spec(int index) -{ - return *((uchar *)(gd->env_addr + index)); -} - void env_relocate_spec(void) { struct mtd_info *mtd = &onenand_mtd; diff --git a/common/env_sf.c b/common/env_sf.c index 592b870..bbd472f 100644 --- a/common/env_sf.c +++ b/common/env_sf.c @@ -59,11 +59,6 @@ char *env_name_spec = "SPI Flash"; static struct spi_flash *env_flash; -uchar env_get_char_spec(int index) -{ - return *((uchar *)(gd->env_addr + index)); -} - #if defined(CONFIG_ENV_OFFSET_REDUND) int saveenv(void) { -- 1.7.3.4

2 1