July 2015 - U-Boot

[U-Boot] [PATCH] tools: remove mpc86x_clk tool
by Masahiro Yamada 28 Jul '15

28 Jul '15

This is commented out in the Makefile for more than 10 years. I assume it is proof that this tool is unused. Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> Cc: Pantelis Antoniou <panto(a)intracom.gr> --- tools/.gitignore | 1 - tools/Makefile | 4 -- tools/mpc86x_clk.c | 202 ----------------------------------------------------- 3 files changed, 207 deletions(-) delete mode 100644 tools/mpc86x_clk.c diff --git a/tools/.gitignore b/tools/.gitignore index 9bc9fec..eb1a27e 100644 --- a/tools/.gitignore +++ b/tools/.gitignore @@ -11,7 +11,6 @@ /mkenvimage /mkimage /mkexynosspl -/mpc86x_clk /mxsboot /mksunxiboot /ncb diff --git a/tools/Makefile b/tools/Makefile index 98414f7..d154464 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -167,10 +167,6 @@ HOSTCFLAGS_md5.o := -pedantic HOSTCFLAGS_sha1.o := -pedantic HOSTCFLAGS_sha256.o := -pedantic -# Don't build by default -#hostprogs-$(CONFIG_PPC) += mpc86x_clk -#HOSTCFLAGS_mpc86x_clk.o := -pedantic - quiet_cmd_wrap = WRAP $@ cmd_wrap = echo "\#include <../$(patsubst $(obj)/%,%,$@)>" >$@ diff --git a/tools/mpc86x_clk.c b/tools/mpc86x_clk.c deleted file mode 100644 index 9f662f7..0000000 --- a/tools/mpc86x_clk.c +++ /dev/null @@ -1,202 +0,0 @@ -/* - * (C) Copyright 2003 Intracom S.A. - * Pantelis Antoniou <panto(a)intracom.gr> - * - * This little program makes an exhaustive search for the - * correct terms of pdf, mfi, mfn, mfd, s, dbrmo, in PLPRCR. - * The goal is to produce a gclk2 from a xin input, while respecting - * all the restrictions on their combination. - * - * Generaly you select the first row of the produced table. - * - * SPDX-License-Identifier: GPL-2.0+ - */ - - -#include <stdio.h> -#include <stdlib.h> - -#define DPREF_MIN 10000000 -#define DPREF_MAX 32000000 - -#define DPGDCK_MAX 320000000 -#define DPGDCK_MIN 160000000 - -#define S_MIN 0 -#define S_MAX 2 - -#define MFI_MIN 5 -#define MFI_MAX 15 - -#define MFN_MIN 0 -#define MFN_MAX 15 - -#define MFD_MIN 0 -#define MFD_MAX 31 - -#define MF_MIN 5 -#define MF_MAX 15 - -#define PDF_MIN 0 -#define PDF_MAX 15 - -#define GCLK2_MAX 150000000 - -static int calculate (int xin, int target_clock, - int ppm, int pdf, int mfi, int mfn, int mfd, int s, - int *dprefp, int *dpgdckp, int *jdbckp, - int *gclk2p, int *dbrmop) -{ - unsigned int dpref, dpgdck, jdbck, gclk2, t1, t2, dbrmo; - - /* valid MFI? */ - if (mfi < MFI_MIN) - return -1; - - /* valid num, denum? */ - if (mfn > 0 && mfn >= mfd) - return -1; - - dpref = xin / (pdf + 1); - - /* valid dpef? */ - if (dpref < DPREF_MIN || dpref > DPREF_MAX) - return -1; - - if (mfn == 0) { - dpgdck = (2 * mfi * xin) / (pdf + 1) ; - dbrmo = 0; - } else { - /* 5 <= mfi + (mfn / mfd + 1) <= 15 */ - t1 = mfd + 1; - t2 = mfi * t1 + mfn; - if ( MF_MIN * t1 > t2 || MF_MAX * t1 < t2) - return -1; - - dpgdck = (unsigned int)(2 * (mfi * mfd + mfi + mfn) * - (unsigned int)xin) / - ((mfd + 1) * (pdf + 1)); - - dbrmo = 10 * mfn < (mfd + 1); - } - - /* valid dpgclk? */ - if (dpgdck < DPGDCK_MIN || dpgdck > DPGDCK_MAX) - return -1; - - jdbck = dpgdck >> s; - gclk2 = jdbck / 2; - - /* valid gclk2 */ - if (gclk2 > GCLK2_MAX) - return -1; - - t1 = abs(gclk2 - target_clock); - - /* XXX max 1MHz dev. in clock */ - if (t1 > 1000000) - return -1; - - /* dev within range (XXX gclk2 scaled to avoid overflow) */ - if (t1 * 1000 > (unsigned int)ppm * (gclk2 / 1000)) - return -1; - - *dprefp = dpref; - *dpgdckp = dpgdck; - *jdbckp = jdbck; - *gclk2p = gclk2; - *dbrmop = dbrmo; - - return gclk2; -} - -int conf_clock(int xin, int target_clock, int ppm) -{ - int pdf, s, mfn, mfd, mfi; - int dpref, dpgdck, jdbck, gclk2, xout, dbrmo; - int found = 0; - - /* integer multipliers */ - for (pdf = PDF_MIN; pdf <= PDF_MAX; pdf++) { - for (mfi = MFI_MIN; mfi <= MFI_MAX; mfi++) { - for (s = 0; s <= S_MAX; s++) { - xout = calculate(xin, target_clock, - ppm, pdf, mfi, 0, 0, s, - &dpref, &dpgdck, &jdbck, - &gclk2, &dbrmo); - if (xout < 0) - continue; - - if (found == 0) { - printf("pdf mfi mfn mfd s dbrmo dpref dpgdck jdbck gclk2 exact?\n"); - printf("--- --- --- --- - ----- ----- ------ ----- ----- ------\n"); - } - - printf("%3d %3d --- --- %1d %5d %9d %9d %9d %9d%s\n", - pdf, mfi, s, dbrmo, - dpref, dpgdck, jdbck, gclk2, - gclk2 == target_clock ? " YES" : ""); - - found++; - } - } - } - - /* fractional multipliers */ - for (pdf = PDF_MIN; pdf <= PDF_MAX; pdf++) { - for (mfi = MFI_MIN; mfi <= MFI_MAX; mfi++) { - for (mfn = 1; mfn <= MFN_MAX; mfn++) { - for (mfd = 1; mfd <= MFD_MAX; mfd++) { - for (s = 0; s <= S_MAX; s++) { - xout = calculate(xin, target_clock, - ppm, pdf, mfi, mfn, mfd, s, - &dpref, &dpgdck, &jdbck, - &gclk2, &dbrmo); - if (xout < 0) - continue; - - if (found == 0) { - printf("pdf mfi mfn mfd s dbrmo dpref dpgdck jdbck gclk2 exact?\n"); - printf("--- --- --- --- - ----- ----- ------ ----- ----- ------\n"); - } - - printf("%3d %3d %3d %3d %1d %5d %9d %9d %9d %9d%s\n", - pdf, mfi, mfn, mfd, s, - dbrmo, dpref, dpgdck, jdbck, gclk2, - gclk2 == target_clock ? " YES" : ""); - - found++; - } - } - } - - } - } - - return found; -} - -int main(int argc, char *argv[]) -{ - int xin, want_gclk2, found, ppm = 100; - - if (argc < 3) { - fprintf(stderr, "usage: mpc86x_clk <xin> <want_gclk2> [ppm]\n"); - fprintf(stderr, " default ppm is 100\n"); - return 10; - } - - xin = atoi(argv[1]); - want_gclk2 = atoi(argv[2]); - if (argc >= 4) - ppm = atoi(argv[3]); - - found = conf_clock(xin, want_gclk2, ppm); - if (found <= 0) { - fprintf(stderr, "cannot produce gclk2 %d from xin %d\n", - want_gclk2, xin); - return EXIT_FAILURE; - } - - return EXIT_SUCCESS; -} -- 1.9.1

2 1

[U-Boot] [PATCH V4 0/8] configs: make keystone2 configs start using armv7 common header
by Nishanth Menon 28 Jul '15

28 Jul '15

Changes since v3: - picked up V3 reviewed bys - Dropped the original 8/8 patch (ramdisk) introduced patch #3 (thumb mode) (dropped patch = https://patchwork.ozlabs.org/patch/497392/ ) Tested on K2HK-evm OMAP4 Panda: http://pastebin.ubuntu.com/11922876/ AM57xx Beagle-X15: http://pastebin.ubuntu.com/11922884/ OMAP5 uevm: http://pastebin.ubuntu.com/11922947/ AM437x-sk: http://pastebin.ubuntu.com/11922954/ V3: http://marc.info/?l=u-boot&m=143723766211035&w=2 V2: http://marc.info/?l=u-boot&m=143707376106583&w=2 V1: http://marc.info/?l=u-boot&m=143706008602124&w=2 buildman report: ./tools/buildman/buildman -b k2h/config-cleanups-v4 -sSd omap4 omap5 omap3 am33xx keystone boards.cfg is up to date. Nothing to do. Summary of 9 commits for 74 boards (20 threads, 1 job per thread) 01: Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq arm: + am335x_boneblack_vboot 02: configs: split ti_armv7_common into a omap generic header 03: configs: ti: armv7_common: enable Thumb mode for all arm: (for 74/74 boards) all -43015.7 bss +1.6 text -43017.4 pepper : all -65176 bss -16 text -65160 cairo : all -70032 bss +8 text -70040 cm_t54 : all -72384 bss +36 text -72420 igep0032 : all -72392 text -72392 igep0020 : all -72456 bss +32 text -72488 igep0030 : all -72456 bss +24 text -72480 omap5_uevm : all -74344 bss +4 text -74348 devkit8000 : all -77880 text -77880 beagle_x15 : all -78264 bss -52 text -78212 cm_t335 : all -80400 bss -24 text -80376 pcm051_rev3 : all -81496 bss -8 text -81488 pcm051_rev1 : all -81496 bss -8 text -81488 am335x_igep0033: all -81816 bss +32 text -81848 igep0020_nand : all -82328 bss +32 text -82360 igep0030_nand : all -82392 bss -48 text -82344 omap3_zoom1 : all -82448 text -82448 pengwyn : all -91840 bss +32 text -91872 dra7xx_evm_uart3: all -92168 bss +32 text -92200 dra7xx_evm_qspiboot: all -92168 bss -52 text -92116 dra7xx_evm : all -92232 bss +16 text -92248 am43xx_evm_ethboot: all -92704 bss -16 text -92688 am43xx_evm : all -92736 text -92736 omap3_pandora : all -95360 bss +32 text -95392 birdland_bav335a: all -98200 bss +40 text -98240 birdland_bav335b: all -98200 bss +40 text -98240 omap3_beagle : all -98308 bss -8 text -98300 am335x_boneblack: all -100400 bss +16 text -100416 am43xx_evm_usbhost_boot: all -101496 bss -24 text -101472 am335x_boneblack_vboot: all -102952 bss +24 text -102976 am335x_evm_spiboot: all -103528 bss -24 text -103504 am335x_evm_usbspl: all -115632 bss +48 text -115680 omap3_overo : all -115840 bss -16 text -115824 am335x_evm : all -117104 bss -8 text -117096 am335x_evm_nor : all -123240 bss -32 text -123208 am335x_baltos : all -131296 bss +8 text -131304 04: board: ks2_evm: get rid of bogus CONFIG_LINUX_BOOT_PARAM_ADDR 05: configs: rename ks2_evm into ti_armv7_keystone2 06: configs: ti_armv7_keystone2: start using armv7_common arm: (for 74/74 boards) all -53.6 bss -447.1 data +56.5 rodata +90.7 spl/u-boot-spl:all +54.8 spl/u-boot-spl:data +5.4 spl/u-boot-spl:rodata +7.5 spl/u-boot-spl:text +41.9 text +246.3 k2hk_evm : all -1280 bss -10984 data +1396 rodata +2236 spl/u-boot-spl:all +1356 spl/u-boot-spl:data +132 spl/u-boot-spl:rodata +184 spl/u-boot-spl:text +1040 text +6072 k2e_evm : all -1283 bss -10992 data +1392 rodata +2237 spl/u-boot-spl:all +1348 spl/u-boot-spl:data +132 spl/u-boot-spl:rodata +184 spl/u-boot-spl:text +1032 text +6080 k2l_evm : all -1407 bss -11108 data +1392 rodata +2237 spl/u-boot-spl:all +1348 spl/u-boot-spl:data +132 spl/u-boot-spl:rodata +184 spl/u-boot-spl:text +1032 text +6072 07: configs: ti_armv7_keystone2: switch addresses to generic addresses arm: (for 74/74 boards) all +1.7 bss +0.1 rodata +1.7 k2l_evm : all +129 bss +88 rodata +41 k2e_evm : all +1 bss -40 rodata +41 k2hk_evm : all -3 bss -44 rodata +41 08: configs: ti_armv7_keystone2: switch to using kernel zImage arm: (for 74/74 boards) all -1.7 bss -0.1 rodata -1.6 k2hk_evm : bss +40 rodata -40 k2e_evm : bss +40 rodata -40 k2l_evm : all -128 bss -88 rodata -40 09: configs: k2*_evm: rename skernel binary names to generated file names arm: (for 74/74 boards) bss +0.2 rodata -0.2 k2hk_evm : bss +4 rodata -4 k2l_evm : bss +4 rodata -4 k2e_evm : bss +4 rodata -4 Nishanth Menon (8): configs: split ti_armv7_common into a omap generic header configs: ti: armv7_common: enable Thumb mode for all board: ks2_evm: get rid of bogus CONFIG_LINUX_BOOT_PARAM_ADDR configs: rename ks2_evm into ti_armv7_keystone2 configs: ti_armv7_keystone2: start using armv7_common configs: ti_armv7_keystone2: switch addresses to generic addresses configs: ti_armv7_keystone2: switch to using kernel zImage configs: k2*_evm: rename skernel binary names to generated file names board/ti/ks2_evm/board.c | 2 +- include/configs/am43xx_evm.h | 2 +- include/configs/k2e_evm.h | 8 +-- include/configs/k2hk_evm.h | 8 +-- include/configs/k2l_evm.h | 8 +-- include/configs/ti_am335x_common.h | 2 +- include/configs/ti_armv7_common.h | 30 ++------ .../configs/{ks2_evm.h => ti_armv7_keystone2.h} | 81 ++++++++-------------- include/configs/ti_armv7_omap.h | 49 +++++++++++++ include/configs/ti_omap3_common.h | 2 +- include/configs/ti_omap4_common.h | 2 +- include/configs/ti_omap5_common.h | 2 +- 12 files changed, 97 insertions(+), 99 deletions(-) rename include/configs/{ks2_evm.h => ti_armv7_keystone2.h} (82%) create mode 100644 include/configs/ti_armv7_omap.h -- 2.1.4

3 19

[U-Boot] [PATCH] nokia_rx51: Typo in CONFIG_MUSB_HCD fixup
by Paul Kocialkowski 28 Jul '15

28 Jul '15

CONFIG_MUSB_HDC should be CONFIG_MUSB_HCD to have any effect. Signed-off-by: Paul Kocialkowski <contact(a)paulk.fr> --- include/configs/nokia_rx51.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index efc583f..6e3ce4d 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -109,7 +109,7 @@ /* USB */ #define CONFIG_MUSB_UDC -#define CONFIG_MUSB_HDC +#define CONFIG_MUSB_HCD #define CONFIG_USB_OMAP3 #define CONFIG_TWL4030_USB -- 1.9.1

2 1

[U-Boot] [PATCH] Update the rootfs type to ext4 for Overo and Pepper
by Adam YH Lee 28 Jul '15

28 Jul '15

Gumstix is migrating from ext3 to ext4 file system. Signed-off-by: Adam YH Lee <adam.yh.lee(a)gmail.com> --- include/configs/omap3_overo.h | 2 +- include/configs/pepper.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h index 76bf3b6..a1a90ec 100644 --- a/include/configs/omap3_overo.h +++ b/include/configs/omap3_overo.h @@ -105,7 +105,7 @@ "defaultdisplay=dvi\0" \ "mmcdev=0\0" \ "mmcroot=/dev/mmcblk0p2 rw\0" \ - "mmcrootfstype=ext3 rootwait\0" \ + "mmcrootfstype=ext4 rootwait\0" \ "nandroot=ubi0:rootfs ubi.mtd=4\0" \ "nandrootfstype=ubifs\0" \ "mtdparts=" MTDPARTS_DEFAULT "\0" \ diff --git a/include/configs/pepper.h b/include/configs/pepper.h index 16149f6..0bdcf22 100644 --- a/include/configs/pepper.h +++ b/include/configs/pepper.h @@ -41,7 +41,7 @@ "optargs=\0" \ "mmcdev=0\0" \ "mmcroot=/dev/mmcblk0p2 rw\0" \ - "mmcrootfstype=ext3 rootwait\0" \ + "mmcrootfstype=ext4 rootwait\0" \ "mmcargs=setenv bootargs console=${console} " \ "${optargs} " \ "root=${mmcroot} " \ -- 2.1.4

3 2

[U-Boot] [PATCH 1/3] stm32f429: pass the device unique ID in DTB
by Antonio Borneo 28 Jul '15

28 Jul '15

Read device unique ID and set environment variable "serial#". Value would then be passed to kernel through DTB. To read ID from DTB, kernel is required to have commit: 3f599875e5202986b350618a617527ab441bf206 (ARM: 8355/1: arch: Show the serial number from devicetree in cpuinfo) This commit is already mainline since v4.1-rc1. Signed-off-by: Antonio Borneo <borneo.antonio(a)gmail.com> To: Albert Aribaud <albert.u.boot(a)aribaud.net> To: Tom Rini <trini(a)konsulko.com> To: Kamil Lulko <rev13(a)wp.pl> Cc: u-boot(a)lists.denx.de --- arch/arm/include/asm/arch-stm32f4/stm32.h | 10 ++++++++++ board/st/stm32f429-discovery/stm32f429-discovery.c | 19 +++++++++++++++++++ include/configs/stm32f429-discovery.h | 1 + 3 files changed, 30 insertions(+) diff --git a/arch/arm/include/asm/arch-stm32f4/stm32.h b/arch/arm/include/asm/arch-stm32f4/stm32.h index a9f88db..3ed3801 100644 --- a/arch/arm/include/asm/arch-stm32f4/stm32.h +++ b/arch/arm/include/asm/arch-stm32f4/stm32.h @@ -14,6 +14,7 @@ /* * Peripheral memory map */ +#define STM32_SYSMEM_BASE 0x1FFF0000 #define STM32_PERIPH_BASE 0x40000000 #define STM32_APB1PERIPH_BASE (STM32_PERIPH_BASE + 0x00000000) #define STM32_APB2PERIPH_BASE (STM32_PERIPH_BASE + 0x00010000) @@ -25,6 +26,12 @@ /* * Register maps */ +struct stm32_u_id_regs { + u32 u_id_low; + u32 u_id_mid; + u32 u_id_high; +}; + struct stm32_rcc_regs { u32 cr; /* RCC clock control */ u32 pllcfgr; /* RCC PLL configuration */ @@ -78,6 +85,9 @@ struct stm32_flash_regs { /* * Registers access macros */ +#define STM32_U_ID_BASE (STM32_SYSMEM_BASE + 0x7A10) +#define STM32_U_ID ((struct stm32_u_id_regs *)STM32_U_ID_BASE) + #define STM32_RCC_BASE (STM32_AHB1PERIPH_BASE + 0x3800) #define STM32_RCC ((struct stm32_rcc_regs *)STM32_RCC_BASE) diff --git a/board/st/stm32f429-discovery/stm32f429-discovery.c b/board/st/stm32f429-discovery/stm32f429-discovery.c index 2dd5d93..f418186 100644 --- a/board/st/stm32f429-discovery/stm32f429-discovery.c +++ b/board/st/stm32f429-discovery/stm32f429-discovery.c @@ -285,3 +285,22 @@ int board_init(void) return 0; } + +#ifdef CONFIG_MISC_INIT_R +int misc_init_r(void) +{ + char serialno[25]; + uint32_t u_id_low, u_id_mid, u_id_high; + + if (!getenv("serial#")) { + u_id_low = readl(&STM32_U_ID->u_id_low); + u_id_mid = readl(&STM32_U_ID->u_id_mid); + u_id_high = readl(&STM32_U_ID->u_id_high); + sprintf(serialno, "%08x%08x%08x", + u_id_high, u_id_mid, u_id_low); + setenv("serial#", serialno); + } + + return 0; +} +#endif diff --git a/include/configs/stm32f429-discovery.h b/include/configs/stm32f429-discovery.h index 1b4fd21..4cc7324 100644 --- a/include/configs/stm32f429-discovery.h +++ b/include/configs/stm32f429-discovery.h @@ -15,6 +15,7 @@ #define CONFIG_OF_LIBFDT #define CONFIG_BOARD_EARLY_INIT_F +#define CONFIG_MISC_INIT_R #define CONFIG_SYS_FLASH_BASE 0x08000000 -- 2.4.6

2 5

[U-Boot] [PATCH v2] Kill unneeded #include <linux/kconfig.h>
by Masahiro Yamada 28 Jul '15

28 Jul '15

Because the top-level Makefile forces all the source files to include include/linux/kconfig.h (see the UBOOTINCLUDE define), these includes are redundant. By the way, there are exceptions for the statement above; host programs. In fact, host tools in U-Boot depend on a particular board configuration, although I think they should not. So, some files still include <linux/config.h> to work around build errors on host tools. Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> Acked-by: Ian Campbell <ijc(a)hellion.org.uk> --- Changes in v2: - Fix a typo in git description include/linux/kconfig -> include/linux/kconfig.h - Add Ian's Acked-by arch/arm/cpu/armv7/sunxi/dram_sun8i_a23.c | 1 - arch/arm/cpu/armv7/sunxi/dram_sun8i_a33.c | 1 - arch/x86/cpu/ivybridge/gma.c | 1 - board/sunxi/dram_sun4i_auto.c | 1 - board/sunxi/dram_sun5i_auto.c | 1 - 5 files changed, 5 deletions(-) diff --git a/arch/arm/cpu/armv7/sunxi/dram_sun8i_a23.c b/arch/arm/cpu/armv7/sunxi/dram_sun8i_a23.c index 165c052..c53671a 100644 --- a/arch/arm/cpu/armv7/sunxi/dram_sun8i_a23.c +++ b/arch/arm/cpu/armv7/sunxi/dram_sun8i_a23.c @@ -26,7 +26,6 @@ #include <asm/arch/clock.h> #include <asm/arch/dram.h> #include <asm/arch/prcm.h> -#include <linux/kconfig.h> static const struct dram_para dram_para = { .clock = CONFIG_DRAM_CLK, diff --git a/arch/arm/cpu/armv7/sunxi/dram_sun8i_a33.c b/arch/arm/cpu/armv7/sunxi/dram_sun8i_a33.c index ebba438..fa1620c 100644 --- a/arch/arm/cpu/armv7/sunxi/dram_sun8i_a33.c +++ b/arch/arm/cpu/armv7/sunxi/dram_sun8i_a33.c @@ -14,7 +14,6 @@ #include <asm/arch/clock.h> #include <asm/arch/dram.h> #include <asm/arch/prcm.h> -#include <linux/kconfig.h> /* PLL runs at 2x dram-clk, controller runs at PLL / 4 (dram-clk / 2) */ #define DRAM_CLK_MUL 2 diff --git a/arch/x86/cpu/ivybridge/gma.c b/arch/x86/cpu/ivybridge/gma.c index ea169b0..89d4a5e 100644 --- a/arch/x86/cpu/ivybridge/gma.c +++ b/arch/x86/cpu/ivybridge/gma.c @@ -16,7 +16,6 @@ #include <asm/pci.h> #include <asm/arch/pch.h> #include <asm/arch/sandybridge.h> -#include <linux/kconfig.h> struct gt_powermeter { u16 reg; diff --git a/board/sunxi/dram_sun4i_auto.c b/board/sunxi/dram_sun4i_auto.c index 149bb51..7d4409b 100644 --- a/board/sunxi/dram_sun4i_auto.c +++ b/board/sunxi/dram_sun4i_auto.c @@ -1,6 +1,5 @@ #include <common.h> #include <asm/arch/dram.h> -#include <linux/kconfig.h> static struct dram_para dram_para = { .clock = CONFIG_DRAM_CLK, diff --git a/board/sunxi/dram_sun5i_auto.c b/board/sunxi/dram_sun5i_auto.c index 596a206..e3fa243 100644 --- a/board/sunxi/dram_sun5i_auto.c +++ b/board/sunxi/dram_sun5i_auto.c @@ -2,7 +2,6 @@ #include <common.h> #include <asm/arch/dram.h> -#include <linux/kconfig.h> static struct dram_para dram_para = { .clock = CONFIG_DRAM_CLK, -- 1.9.1

3 2

[U-Boot] [PATCH] board: ks2: README: fix typos
by Nishanth Menon 28 Jul '15

28 Jul '15

Fix up a few typos in documentation. Signed-off-by: Nishanth Menon <nm(a)ti.com> --- board/ti/ks2_evm/README | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/board/ti/ks2_evm/README b/board/ti/ks2_evm/README index 9ee90a4f9d03..6586faba32eb 100644 --- a/board/ti/ks2_evm/README +++ b/board/ti/ks2_evm/README @@ -47,7 +47,6 @@ Board configuration files: include/configs/k2hk_evm.h include/configs/k2e_evm.h include/configs/k2l_evm.h -include/configs/k2l_evm.h As u-boot is migrating to Kconfig there is also board defconfig files configs/k2e_evm_defconfig @@ -71,7 +70,7 @@ Don't forget to add ARCH=arm and CROSS_COMPILE. To build u-boot.bin >make k2hk_evm_defconfig - >make u-boot-spi.gph + >make u-boot.bin To build u-boot-spi.gph >make k2hk_evm_defconfig -- 2.1.4

3 3

[U-Boot] [PATCH] am33xx: Unused get_board_rev function removal
by Paul Kocialkowski 28 Jul '15

28 Jul '15

All am33xx device tree are using device-tree, so get_board_rev is never actually called. Thus, we can get rid of it to make the code easier to maintain. Signed-off-by: Paul Kocialkowski <contact(a)paulk.fr> --- arch/arm/cpu/armv7/am33xx/sys_info.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/arch/arm/cpu/armv7/am33xx/sys_info.c b/arch/arm/cpu/armv7/am33xx/sys_info.c index 781d83f..52a6824 100644 --- a/arch/arm/cpu/armv7/am33xx/sys_info.c +++ b/arch/arm/cpu/armv7/am33xx/sys_info.c @@ -51,15 +51,6 @@ u32 get_cpu_type(void) } /** - * get_board_rev() - setup to pass kernel board revision information - * returns: 0 for the ATAG REVISION tag value. - */ -u32 __weak get_board_rev(void) -{ - return 0; -} - -/** * get_device_type(): tell if GP/HS/EMU/TST */ u32 get_device_type(void) -- 1.9.1

2 3

[U-Boot] [PATCH 1/2] omap3: CONFIG_REVISION_TAG ifdef check for get_board_rev
by Paul Kocialkowski 28 Jul '15

28 Jul '15

Despite being defined with __weak, this declaration of get_board_rev will conflict with the fallback one when ONFIG_REVISION_TAG is not defined. Signed-off-by: Paul Kocialkowski <contact(a)paulk.fr> --- arch/arm/cpu/armv7/omap3/sys_info.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/cpu/armv7/omap3/sys_info.c b/arch/arm/cpu/armv7/omap3/sys_info.c index bbb65bb..ab60a03 100644 --- a/arch/arm/cpu/armv7/omap3/sys_info.c +++ b/arch/arm/cpu/armv7/omap3/sys_info.c @@ -196,10 +196,12 @@ u32 get_gpmc0_width(void) * get_board_rev() - setup to pass kernel board revision information * returns:(bit[0-3] sub version, higher bit[7-4] is higher version) *************************************************************************/ +#ifdef CONFIG_REVISION_TAG u32 __weak get_board_rev(void) { return 0x20; } +#endif /******************************************************** * get_base(); get upper addr of current execution -- 1.9.1

2 6

[U-Boot] [PATCH v3 0/2]
by Masahiro Yamada 28 Jul '15

28 Jul '15

1/2: refactors a little because NDS32 actually need not the symbolic link 2/2: introduce a new config to avoid broken symbolic links. Masahiro Yamada (2): nds32: include <asm/arch-*/*.h> instead of <asm/arch/*.h> kbuild: create symbolic link only for ARM, AVR32, SPARC, PowerPC, x86 arch/Kconfig | 7 +++++++ arch/powerpc/Kconfig | 3 +++ include/configs/adp-ag101.h | 2 +- include/configs/adp-ag101p.h | 2 +- include/configs/adp-ag102.h | 2 +- scripts/Makefile.autoconf | 2 ++ 6 files changed, 15 insertions(+), 3 deletions(-) -- 1.9.1

3 5