January 2014 - U-Boot

[U-Boot] nios2-generic board is broken
by Masahiro Yamada 28 Jan '14

28 Jan '14

Hi. I have noticed nios2-generic board is broken. Please fix. Error messages: nios2-generic.c: In function `__early_flash_cmd_reset': nios2-generic.c:23: error: `AMD_CMD_RESET' undeclared (first use in this function) nios2-generic.c:23: error: (Each undeclared identifier is reported only once nios2-generic.c:23: error: for each function it appears in.) nios2-generic.c:24: error: `FLASH_CMD_RESET' undeclared (first use in this function) The result of git bisect is: a113fb39df43546c704aa8eba55720da9a9dfedd is the first bad commit commit a113fb39df43546c704aa8eba55720da9a9dfedd Author: Ezequiel Garcia <ezequiel.garcia(a)free-electrons.com> Date: Fri Dec 20 18:34:53 2013 -0300 board: nios2: Add CONFIG_CFI_FLASH_MTD guard to flash.h header include Signed-off-by: Ezequiel Garcia <ezequiel.garcia(a)free-electrons.com> Best Regards Masahiro Yamada

1 0

Re: [U-Boot] [PATCH 1/2] SECURE BOOT: add version info for ISBC
by Wolfgang Denk 28 Jan '14

28 Jan '14

Dear Aneesh, In message <caf0224e47434bdba2623faeea12bd9a(a)DM2PR03MB415.namprd03.prod.outlook.com> you wrote: > > > But this is what I had in mind. It appears to be a simple 1:1 mapping > > from SoC to ISBC version to me, or am I wrong here? ... > Yes, it is a 1:1 mapping from SoC to ISBC version but we have multiple SoC's > having the same ISBC version. So using the SoC names would result in having > a long list of SoC's wherever we are doing some stuff specific to the ISBC > version. > Also in future, we might have new versions of ISBC with more features. > SO having multiple SoC specific checks inside the code would lead to confusion. So don't use code, and instead make this data-driven. Use a lookup-table. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd(a)denx.de "The algorithm to do that is extremely nasty. You might want to mug someone with it." - M. Devine, Computer Science 340

2 1

[U-Boot] [PATCH] SPL: Add CONFIG_SUPPORT_EMMC_BOOT support to CONFIG_SPL_FRAMEWORK
by Tom Rini 27 Jan '14

27 Jan '14

We use the switch CONFIG_SUPPORT_EMMC_BOOT today to enable some additional features of the eMMC boot partitions. Add support for being told that we have booted from one of these partitions to the spl framework and implement this for the dra7xx_evm board. Cc: Pantelis Antoniou <panto(a)antoniou-consulting.com> Cc: Lokesh Vutla <lokeshvutla(a)ti.com> Signed-off-by: Tom Rini <trini(a)ti.com> --- arch/arm/cpu/armv7/omap-common/boot-common.c | 8 +++++++- boards.cfg | 1 + common/spl/spl_mmc.c | 16 ++++++++++++++++ include/spl.h | 1 + 4 files changed, 25 insertions(+), 1 deletion(-) diff --git a/arch/arm/cpu/armv7/omap-common/boot-common.c b/arch/arm/cpu/armv7/omap-common/boot-common.c index 69fff32..ec0f936 100644 --- a/arch/arm/cpu/armv7/omap-common/boot-common.c +++ b/arch/arm/cpu/armv7/omap-common/boot-common.c @@ -66,7 +66,13 @@ u32 spl_boot_device(void) u32 spl_boot_mode(void) { - return gd->arch.omap_boot_params.omap_bootmode; + u32 val = gd->arch.omap_boot_params.omap_bootmode; + +#ifdef CONFIG_SUPPORT_EMMC_BOOT + if (val == 0) + val = MMCSD_MODE_EMMCBOOT; +#endif + return val; } void spl_board_init(void) diff --git a/boards.cfg b/boards.cfg index 2dfd2b4..96fc2bf 100644 --- a/boards.cfg +++ b/boards.cfg @@ -343,6 +343,7 @@ Active arm armv7 omap3 timll devkit8000 Active arm armv7 omap4 ti panda omap4_panda - Sricharan R <r.sricharan(a)ti.com> Active arm armv7 omap4 ti sdp4430 omap4_sdp4430 - Sricharan R <r.sricharan(a)ti.com> Active arm armv7 omap5 ti dra7xx dra7xx_evm dra7xx_evm:CONS_INDEX=1 Lokesh Vutla <lokeshvutla(a)ti.com> +Active arm armv7 omap5 ti dra7xx dra7xx_evm_emmcboot dra7xx_evm:CONS_INDEX=1,SUPPORT_EMMC_BOOT Lokesh Vutla <lokeshvutla(a)ti.com> Active arm armv7 omap5 ti dra7xx dra7xx_evm_uart3 dra7xx_evm:CONS_INDEX=3,SPL_YMODEM_SUPPORT Lokesh Vutla <lokeshvutla(a)ti.com> Active arm armv7 omap5 ti omap5_uevm omap5_uevm - - Active arm armv7 rmobile atmark-techno armadillo-800eva armadillo-800eva - Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj(a)renesas.com> diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index 13fbff0..be68b27 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -111,6 +111,22 @@ void spl_mmc_load_image(void) CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION, CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME); #endif +#ifdef CONFIG_SUPPORT_EMMC_BOOT + } else if (boot_mode == MMCSD_MODE_EMMCBOOT) { + /* Switch to the currently configured boot partition. */ + if (mmc_switch_part(0, (mmc->part_config >> 3) & + PART_ACCESS_MASK)) { +#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT + puts("MMC partition switch failed\n"); +#endif + hang(); + } +#ifdef CONFIG_SPL_OS_BOOT + if (spl_start_uboot() || mmc_load_image_raw_os(mmc)) +#endif + err = mmc_load_image_raw(mmc, + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR); +#endif } else { #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT puts("spl: wrong MMC boot mode\n"); diff --git a/include/spl.h b/include/spl.h index 5e24856..dad00c0 100644 --- a/include/spl.h +++ b/include/spl.h @@ -16,6 +16,7 @@ #define MMCSD_MODE_UNDEFINED 0 #define MMCSD_MODE_RAW 1 #define MMCSD_MODE_FAT 2 +#define MMCSD_MODE_EMMCBOOT 3 struct spl_image_info { const char *name; -- 1.7.9.5

1 0

[U-Boot] [PATCH V2 1/5] fs: fix generic save command implementation
by Stephen Warren 27 Jan '14

27 Jan '14

From: Stephen Warren <swarren(a)nvidia.com> Fix a few issues with the generic "save" shell command, and fs_write() function. 1) fstypes[].write wasn't filled in for some file-systems, and isn't checked when used, which could cause crashes/... if executing save on e.g. fat/ext filesystems. 2) fs_write() requires the length argument to be non-zero, since it needs to know exactly how many bytes to write. Adjust the comments and code according to this. 3) fs_write() wasn't prototyped in <fs.h> like other generic functions; other code should be able to call this directly rather than invoking the "save" shell command. Cc: Simon Glass <sjg(a)chromium.org> Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- fs/fs.c | 9 +++------ include/fs.h | 10 ++++++++++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/fs/fs.c b/fs/fs.c index be1855d1291f..9c2ef6b6597c 100644 --- a/fs/fs.c +++ b/fs/fs.c @@ -75,6 +75,7 @@ static struct fstype_info fstypes[] = { .close = fat_close, .ls = file_fat_ls, .read = fat_read_file, + .write = fs_write_unsupported, }, #endif #ifdef CONFIG_FS_EXT4 @@ -84,6 +85,7 @@ static struct fstype_info fstypes[] = { .close = ext4fs_close, .ls = ext4fs_ls, .read = ext4_read_file, + .write = fs_write_unsupported, }, #endif #ifdef CONFIG_SANDBOX @@ -212,16 +214,11 @@ int fs_write(const char *filename, ulong addr, int offset, int len) void *buf; int ret; - /* - * We don't actually know how many bytes are being read, since len==0 - * means read the whole file. - */ buf = map_sysmem(addr, len); ret = info->write(filename, buf, offset, len); unmap_sysmem(buf); - /* If we requested a specific number of bytes, check we got it */ - if (ret >= 0 && len && ret != len) { + if (ret >= 0 && ret != len) { printf("** Unable to write file %s **\n", filename); ret = -1; } diff --git a/include/fs.h b/include/fs.h index 7d9403ed8758..97b0094e954b 100644 --- a/include/fs.h +++ b/include/fs.h @@ -55,6 +55,16 @@ int fs_ls(const char *dirname); int fs_read(const char *filename, ulong addr, int offset, int len); /* + * Write file "filename" to the partition previously set by fs_set_blk_dev(), + * from address "addr", starting at byte offset "offset", and writing "len" + * bytes. "offset" may be 0 to write to the start of the file. Note that not + * all filesystem types support offset!=0. + * + * Returns number of bytes read on success. Returns <= 0 on error. + */ +int fs_write(const char *filename, ulong addr, int offset, int len); + +/* * Common implementation for various filesystem commands, optionally limited * to a specific filesystem type via the fstype parameter. */ -- 1.8.1.5

3 16

[U-Boot] Pull request: u-boot-spi/master
by Jagannadha Sutradharudu Teki 27 Jan '14

27 Jan '14

Hi Tom, SF code optimized stuff and few fixes. -- Thanks! Jagan. The following changes since commit 0876703cf2ee107372b56037d4eeeb7604c56796: boards.cfg: Keep the entries sorted (2014-01-27 08:28:35 -0500) are available in the git repository at: git://git.denx.de/u-boot-spi.git master for you to fetch changes up to 6dc0ce128f1d3ec8a06f98606d9c6f5020b98b3f: sf: Update bank configuration (2014-01-27 22:47:17 +0530) ---------------------------------------------------------------- Jagannadha Sutradharudu Teki (5): sf: ops: Squash the malloc+memset combo sf: Optimize flash features code sf: Use slave mode for dual_flash connection doc: SPI: Update the dual_flash info sf: Update bank configuration Marek Vasut (3): sf: Squash the malloc+memset combo sf: Fix entries for S25FL256S_256K and S25FL512S_256K sf: Add S25FL128S_256K IDs doc/SPI/README.dual-flash | 5 +- doc/SPI/README.sf-features | 124 ++++++++++++++++++++++++++++++ drivers/mtd/spi/sf.c | 4 +- drivers/mtd/spi/sf_internal.h | 1 - drivers/mtd/spi/sf_ops.c | 16 ++-- drivers/mtd/spi/sf_params.c | 171 +++++++++++++++++++++--------------------- drivers/mtd/spi/sf_probe.c | 104 ++++++++++++------------- include/spi.h | 42 ++++------- include/spi_flash.h | 34 ++++----- 9 files changed, 303 insertions(+), 198 deletions(-) create mode 100644 doc/SPI/README.sf-features

2 1

[U-Boot] [PATCH V3 01/14] mmc: tegra: support Tegra124
by Stephen Warren 27 Jan '14

27 Jan '14

From: Stephen Warren <swarren(a)nvidia.com> Tegra124's MMC controller is very similar to earlier SoC generations, and can be supported by the same driver. However, there are some non-backwards-compatible HW differences, and hence a new DT compatible value must be used to describe the HW. This patch updates the driver to support that new compatible value. That said, the HW differences are only relevant when enabling certain high-performance transfer modes. Since the driver is currently very simple and doesn't enable those modes, we don't actually need to address any of these HW differences in the code yet, hence the simple nature of this patch. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> Acked-by: Pantelis Antoniou <panto(a)antoniou-consulting.com> Tested-by: Thierry Reding <treding(a)nvidia.com> --- v2: New patch. This patch is needed for MMC support on Tegra124 at run-time, but not strictly required at compile-time. So, it can either go into the MMC tree and all get merged together in the main U-Boot repo, or the MMC maintainer can ack it to go through the Tegra tree with the rest of the changes. --- drivers/mmc/tegra_mmc.c | 9 +++++++++ include/fdtdec.h | 1 + lib/fdtdec.c | 1 + 3 files changed, 11 insertions(+) diff --git a/drivers/mmc/tegra_mmc.c b/drivers/mmc/tegra_mmc.c index e1817e24f6d4..3d1ce1263c82 100644 --- a/drivers/mmc/tegra_mmc.c +++ b/drivers/mmc/tegra_mmc.c @@ -668,6 +668,15 @@ void tegra_mmc_init(void) const void *blob = gd->fdt_blob; debug("%s entry\n", __func__); + /* See if any Tegra124 MMC controllers are present */ + count = fdtdec_find_aliases_for_id(blob, "sdhci", + COMPAT_NVIDIA_TEGRA124_SDMMC, node_list, MAX_HOSTS); + debug("%s: count of Tegra124 sdhci nodes is %d\n", __func__, count); + if (process_nodes(blob, node_list, count)) { + printf("%s: Error processing T30 mmc node(s)!\n", __func__); + return; + } + /* See if any Tegra30 MMC controllers are present */ count = fdtdec_find_aliases_for_id(blob, "sdhci", COMPAT_NVIDIA_TEGRA30_SDMMC, node_list, MAX_HOSTS); diff --git a/include/fdtdec.h b/include/fdtdec.h index 433d6a7c0256..19bab7944817 100644 --- a/include/fdtdec.h +++ b/include/fdtdec.h @@ -59,6 +59,7 @@ enum fdt_compat_id { COMPAT_NVIDIA_TEGRA20_NAND, /* Tegra2 NAND controller */ COMPAT_NVIDIA_TEGRA20_PWM, /* Tegra 2 PWM controller */ COMPAT_NVIDIA_TEGRA20_DC, /* Tegra 2 Display controller */ + COMPAT_NVIDIA_TEGRA124_SDMMC, /* Tegra124 SDMMC controller */ COMPAT_NVIDIA_TEGRA30_SDMMC, /* Tegra30 SDMMC controller */ COMPAT_NVIDIA_TEGRA20_SDMMC, /* Tegra20 SDMMC controller */ COMPAT_NVIDIA_TEGRA20_SFLASH, /* Tegra 2 SPI flash controller */ diff --git a/lib/fdtdec.c b/lib/fdtdec.c index 207314fa72fb..1fecab3fbc30 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -32,6 +32,7 @@ static const char * const compat_names[COMPAT_COUNT] = { COMPAT(NVIDIA_TEGRA20_NAND, "nvidia,tegra20-nand"), COMPAT(NVIDIA_TEGRA20_PWM, "nvidia,tegra20-pwm"), COMPAT(NVIDIA_TEGRA20_DC, "nvidia,tegra20-dc"), + COMPAT(NVIDIA_TEGRA124_SDMMC, "nvidia,tegra124-sdhci"), COMPAT(NVIDIA_TEGRA30_SDMMC, "nvidia,tegra30-sdhci"), COMPAT(NVIDIA_TEGRA20_SDMMC, "nvidia,tegra20-sdhci"), COMPAT(NVIDIA_TEGRA20_SFLASH, "nvidia,tegra20-sflash"), -- 1.8.1.5

2 16

[U-Boot] [PATCH V2 01/13] mmc: tegra: support Tegra124
by Stephen Warren 27 Jan '14

27 Jan '14

From: Stephen Warren <swarren(a)nvidia.com> Tegra124's MMC controller is very similar to earlier SoC generations, and can be supported by the same driver. However, there are some non-backwards-compatible HW differences, and hence a new DT compatible value must be used to describe the HW. This patch updates the driver to support that new compatible value. That said, the HW differences are only relevant when enabling certain high-performance transfer modes. Since the driver is currently very simple and doesn't enable those modes, we don't actually need to address any of these HW differences in the code yet, hence the simple nature of this patch. Cc: Pantelis Antoniou <panto(a)antoniou-consulting.com> Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- v2: New patch. This patch is needed for MMC support on Tegra124 at run-time, but not strictly required at compile-time. So, it can either go into the MMC tree and all get merged together in the main U-Boot repo, or the MMC maintainer can ack it to go through the Tegra tree with the rest of the changes. --- drivers/mmc/tegra_mmc.c | 9 +++++++++ include/fdtdec.h | 1 + lib/fdtdec.c | 1 + 3 files changed, 11 insertions(+) diff --git a/drivers/mmc/tegra_mmc.c b/drivers/mmc/tegra_mmc.c index e1817e24f6d4..3d1ce1263c82 100644 --- a/drivers/mmc/tegra_mmc.c +++ b/drivers/mmc/tegra_mmc.c @@ -668,6 +668,15 @@ void tegra_mmc_init(void) const void *blob = gd->fdt_blob; debug("%s entry\n", __func__); + /* See if any Tegra124 MMC controllers are present */ + count = fdtdec_find_aliases_for_id(blob, "sdhci", + COMPAT_NVIDIA_TEGRA124_SDMMC, node_list, MAX_HOSTS); + debug("%s: count of Tegra124 sdhci nodes is %d\n", __func__, count); + if (process_nodes(blob, node_list, count)) { + printf("%s: Error processing T30 mmc node(s)!\n", __func__); + return; + } + /* See if any Tegra30 MMC controllers are present */ count = fdtdec_find_aliases_for_id(blob, "sdhci", COMPAT_NVIDIA_TEGRA30_SDMMC, node_list, MAX_HOSTS); diff --git a/include/fdtdec.h b/include/fdtdec.h index 433d6a7c0256..19bab7944817 100644 --- a/include/fdtdec.h +++ b/include/fdtdec.h @@ -59,6 +59,7 @@ enum fdt_compat_id { COMPAT_NVIDIA_TEGRA20_NAND, /* Tegra2 NAND controller */ COMPAT_NVIDIA_TEGRA20_PWM, /* Tegra 2 PWM controller */ COMPAT_NVIDIA_TEGRA20_DC, /* Tegra 2 Display controller */ + COMPAT_NVIDIA_TEGRA124_SDMMC, /* Tegra124 SDMMC controller */ COMPAT_NVIDIA_TEGRA30_SDMMC, /* Tegra30 SDMMC controller */ COMPAT_NVIDIA_TEGRA20_SDMMC, /* Tegra20 SDMMC controller */ COMPAT_NVIDIA_TEGRA20_SFLASH, /* Tegra 2 SPI flash controller */ diff --git a/lib/fdtdec.c b/lib/fdtdec.c index 207314fa72fb..1fecab3fbc30 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -32,6 +32,7 @@ static const char * const compat_names[COMPAT_COUNT] = { COMPAT(NVIDIA_TEGRA20_NAND, "nvidia,tegra20-nand"), COMPAT(NVIDIA_TEGRA20_PWM, "nvidia,tegra20-pwm"), COMPAT(NVIDIA_TEGRA20_DC, "nvidia,tegra20-dc"), + COMPAT(NVIDIA_TEGRA124_SDMMC, "nvidia,tegra124-sdhci"), COMPAT(NVIDIA_TEGRA30_SDMMC, "nvidia,tegra30-sdhci"), COMPAT(NVIDIA_TEGRA20_SDMMC, "nvidia,tegra20-sdhci"), COMPAT(NVIDIA_TEGRA20_SFLASH, "nvidia,tegra20-sflash"), -- 1.8.1.5

4 22

[U-Boot] [PATCH] sandbox: fix the return type of os_free() function
by Masahiro Yamada 27 Jan '14

27 Jan '14

The function os_free() returns nothing. Its return type should be "void" rather than "void *". Signed-off-by: Masahiro Yamada <yamada.m(a)jp.panasonic.com> --- Simon, This commit fixes a warning: u-boot/include/os.h: In function ‘os_free’: arch/sandbox/cpu/os.c:153:1: warning: control reaches end of non-void function [-Wreturn-type] But, this warning message is not displayed on the current u-boot/master because commit cbe5cdfcd3 changed arch/sandbox/cpu/Makefile badly. The build rule in arch/sandbox/cpu/Makefile $(obj)os.o: ALL_CFLAGS := $(BASE_CPPFLAGS) \ $(patsubst %, -idirafter %, $(BASE_INCLUDE_DIRS)) drops many flags including "-Wall". That's why you did not notice such a mistake, which the build system should have detected. This problem can be fixed in my patch http://patchwork.ozlabs.org/patch/294233/ (It is also a prerequisite for my Kbuild series.) arch/sandbox/cpu/os.c | 2 +- include/os.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/sandbox/cpu/os.c b/arch/sandbox/cpu/os.c index 725b505..2e2fc58 100644 --- a/arch/sandbox/cpu/os.c +++ b/arch/sandbox/cpu/os.c @@ -143,7 +143,7 @@ void *os_malloc(size_t length) return hdr + 1; } -void *os_free(void *ptr) +void os_free(void *ptr) { struct os_mem_hdr *hdr = ptr; diff --git a/include/os.h b/include/os.h index b65fba4..d6d6e57 100644 --- a/include/os.h +++ b/include/os.h @@ -113,7 +113,7 @@ void *os_malloc(size_t length); * * \param ptr Pointer to memory block to free */ -void *os_free(void *ptr); +void os_free(void *ptr); /** * Reallocate previously-allocated memory to increase/decrease space -- 1.8.3.2

3 2

[U-Boot] [PATCH v3] board_r - fixup functions table after relocation
by Alexey Brodkin 27 Jan '14

27 Jan '14

This is only required for "PIC" relocation and doesn't apply to modern "PIE" relocation which does data relocation as well as code. "init_sequence_r" is just an array that consists of compile-time adresses of init functions. Since this is basically an array of integers (pointers to "void" to be more precise) it won't be modified during relocation - it will be just copied to new location as it is. As a consequence on execution after relocation "initcall_run_list" will be jumping to pre-relocation addresses. As long as we don't overwrite pre-relocation memory area init calls are executed correctly. But still it is dangerous because after relocation we don't expect initially used memory to stay untouched. Signed-off-by: Alexey Brodkin <abrodkin(a)synopsys.com> Cc: Tom Rini <trini(a)ti.com> Cc: Simon Glass <sjg(a)chromium.org> Cc: Masahiro Yamada <yamada.m(a)jp.panasonic.com> Cc: Doug Anderson <dianders(a)chromium.org> Cc: Thomas Langer <thomas.langer(a)lantiq.com> Cc: Albert ARIBAUD <albert.u.boot(a)aribaud.net> Changes to v2: * Use ARRAY_SIZE as suggested by Simon Glass * Added CONFIG_NEEDS_MANUAL_RELOC wrapper for temporary index variable "i" to fix compile-time warning for boards without CONFIG_NEEDS_MANUAL_RELOC --- common/board_r.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/common/board_r.c b/common/board_r.c index 86ca1cb..c2d0763 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -903,9 +903,19 @@ init_fnc_t init_sequence_r[] = { void board_init_r(gd_t *new_gd, ulong dest_addr) { +#ifdef CONFIG_NEEDS_MANUAL_RELOC + int i; +#endif + #ifndef CONFIG_X86 gd = new_gd; #endif + +#ifdef CONFIG_NEEDS_MANUAL_RELOC + for (i = 0; i < ARRAY_SIZE(init_sequence_r); i++) + init_sequence_r[i] += gd->reloc_off; +#endif + if (initcall_run_list(init_sequence_r)) hang(); -- 1.8.4.2

3 3

[U-Boot] [uBoot] [Patch v2 1/4] spl: common: Properly ignore spl/Makefile in .gitignore
by Dan Murphy 27 Jan '14

27 Jan '14

The spl directory is ignored by git as these objects are created during spl creation. The only file not created is the Makefile. This file can be modified and checked in via git. Due to the order of rule precedence having the whole directory ignored first then indicating not to ignore the Makefile is not correct the message to force adding the Makefile is still shown. So reorder the .gitignore for the Makefile and indicate that the Makefile does not need to be ignored first and then indicate everything else in spl should be ignored after wards. Signed-off-by: Dan Murphy <dmurphy(a)ti.com> --- v2 - No change just a rebase - http://patchwork.ozlabs.org/patch/309263/ .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 3b14c25..7f006c8 100644 --- a/.gitignore +++ b/.gitignore @@ -57,8 +57,8 @@ /errlog /reloc_off -/spl/ !/spl/Makefile +/spl/* /tpl/ /include/generated/ -- 1.7.9.5

2 7