March 2015 - U-Boot

[U-Boot] [PATCH] buildman: crash when fetching i386 toolchain from kernel.org
by Heiko Schocher 04 Mar '15

04 Mar '15

Currently buildman crashes when fetching i386 toolchain from kernel.org. solution: - first check, if the directory in which buildman will search exists - second, pass a string not a list of strings when instantiating a Toolchain object Signed-off-by: Heiko Schocher <hs(a)denx.de> --- Tried to fetch toolchain for i386 with buildman, and get this error: $ ./tools/buildman/buildman sandbox --fetch-arch i386 Checking: https://www.kernel.org/pub/tools/crosstool/files/bin/x86_64/4.6.3/ Downloading: https://www.kernel.org/pub/tools/crosstool/files/bin/x86_64/4.6.3/x86_64-gc… Unpacking to: /home/hs/.buildman-toolchains Testing - looking in '/home/hs/.buildman-toolchains/gcc-4.6.3-nolibc/i386-linux/.' - looking in '/home/hs/.buildman-toolchains/gcc-4.6.3-nolibc/i386-linux/bin' - found '/home/hs/.buildman-toolchains/gcc-4.6.3-nolibc/i386-linux/bin/i386-linux-gcc' - looking in '/home/hs/.buildman-toolchains/gcc-4.6.3-nolibc/i386-linux/usr/bin' Traceback (most recent call last): File "./tools/buildman/buildman", line 64, in <module> ret_code = control.DoBuildman(options, args) File "/home/hs/zug/u-boot/tools/buildman/control.py", line 132, in DoBuildman ret = toolchains.FetchAndInstall(arch) File "/home/hs/zug/u-boot/tools/buildman/toolchain.py", line 472, in FetchAndInstall toolchain = Toolchain(compiler_fname, True, True) File "/home/hs/zug/u-boot/tools/buildman/toolchain.py", line 62, in __init__ self.path = os.path.dirname(fname) File "/usr/lib64/python2.7/posixpath.py", line 129, in dirname i = p.rfind('/') + 1 AttributeError: 'list' object has no attribute 'rfind' $ with this patch I see: $ ./tools/buildman/buildman sandbox --fetch-arch i386 Checking: https://www.kernel.org/pub/tools/crosstool/files/bin/x86_64/4.6.3/ Downloading: https://www.kernel.org/pub/tools/crosstool/files/bin/x86_64/4.6.3/x86_64-gc… Unpacking to: /home/hs/.buildman-toolchains Testing - looking in '/home/hs/.buildman-toolchains/gcc-4.6.3-nolibc/i386-linux/.' - looking in '/home/hs/.buildman-toolchains/gcc-4.6.3-nolibc/i386-linux/bin' - found '/home/hs/.buildman-toolchains/gcc-4.6.3-nolibc/i386-linux/bin/i386-linux-gcc' Tool chain test: OK $ tools/buildman/toolchain.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tools/buildman/toolchain.py b/tools/buildman/toolchain.py index 537797a..93811ea 100644 --- a/tools/buildman/toolchain.py +++ b/tools/buildman/toolchain.py @@ -200,10 +200,11 @@ class Toolchains: fnames = [] for subdir in ['.', 'bin', 'usr/bin']: dirname = os.path.join(path, subdir) - if verbose: print " - looking in '%s'" % dirname - for fname in glob.glob(dirname + '/*gcc'): - if verbose: print " - found '%s'" % fname - fnames.append(fname) + if os.path.exists(dirname): + if verbose: print " - looking in '%s'" % dirname + for fname in glob.glob(dirname + '/*gcc'): + if verbose: print " - found '%s'" % fname + fnames.append(fname) return fnames @@ -469,7 +470,7 @@ class Toolchains: if not compiler_fname: print 'Could not locate C compiler - fetch failed.' return 1 - toolchain = Toolchain(compiler_fname, True, True) + toolchain = Toolchain(compiler_fname[0], True, True) # Make sure that it will be found by buildman if not self.TestSettingsHasPath(dirpath): -- 2.1.0

2 1

[U-Boot] [PATCH v2 0/4] various fixes for apalis/colibri_t30
by Marcel Ziswiler 04 Mar '15

04 Mar '15

The following is a set of various fixes for Toradex Apalis and Colibri T30. Changes in v2: - Include commit subject too when referencing a previous commit as suggested by Stephen - Add various acked- and reviewed-by - Drop CONFIG_CMDLINE_EDITING and CONFIG_CMD_FS_GENERIC as they already get pulled in via config_distro_defaults.h as noted by Stephen Marcel Ziswiler (4): dm: tegra: dts: add aliases for spi on apalis_t30 apalis/colibri_t30: fix MMC/SD card detect GPIOs apalis_t30: enable gigabit ethernet via pcie apalis/colibri_t30: add misc cmds increase buf sizes and max args arch/arm/dts/tegra30-apalis.dts | 13 +++++++++++-- arch/arm/dts/tegra30-colibri.dts | 4 +++- include/configs/apalis_t30.h | 29 ++++++++++++++++++++++------- include/configs/colibri_t30.h | 24 ++++++++++++++++++++++-- 4 files changed, 58 insertions(+), 12 deletions(-) -- 1.9.3

2 6

[U-Boot] [PATCH] usb_storage : scan all interfaces to find a storage device
by franck.jullien＠gmail.com 04 Mar '15

04 Mar '15

From: Franck Jullien <franck.jullien(a)gmail.com> Mass storage is not necessary present on interface 0. This patch allow usb_stor_scan to look in every available interface. Signed-off-by: Franck Jullien <franck.jullien(a)gmail.com> --- common/usb_storage.c | 32 +++++++++++++++++--------------- 1 files changed, 17 insertions(+), 15 deletions(-) diff --git a/common/usb_storage.c b/common/usb_storage.c index 1411737..a9160fd 100644 --- a/common/usb_storage.c +++ b/common/usb_storage.c @@ -215,7 +215,7 @@ static unsigned int usb_get_max_lun(struct us_data *us) */ int usb_stor_scan(int mode) { - unsigned char i; + unsigned char i, iface; struct usb_device *dev; if (mode == 1) @@ -241,20 +241,22 @@ int usb_stor_scan(int mode) if (dev == NULL) break; /* no more devices available */ - if (usb_storage_probe(dev, 0, &usb_stor[usb_max_devs])) { - /* OK, it's a storage device. Iterate over its LUNs - * and populate `usb_dev_desc'. - */ - int lun, max_lun, start = usb_max_devs; - - max_lun = usb_get_max_lun(&usb_stor[usb_max_devs]); - for (lun = 0; - lun <= max_lun && usb_max_devs < USB_MAX_STOR_DEV; - lun++) { - usb_dev_desc[usb_max_devs].lun = lun; - if (usb_stor_get_info(dev, &usb_stor[start], - &usb_dev_desc[usb_max_devs]) == 1) { - usb_max_devs++; + for (iface = 0; iface < dev->config.no_of_if; iface++) { + if (usb_storage_probe(dev, 0, &usb_stor[usb_max_devs])) { + /* OK, it's a storage device. Iterate over its LUNs + * and populate `usb_dev_desc'. + */ + int lun, max_lun, start = usb_max_devs; + + max_lun = usb_get_max_lun(&usb_stor[usb_max_devs]); + for (lun = 0; + lun <= max_lun && usb_max_devs < USB_MAX_STOR_DEV; + lun++) { + usb_dev_desc[usb_max_devs].lun = lun; + if (usb_stor_get_info(dev, &usb_stor[start], + &usb_dev_desc[usb_max_devs]) == 1) { + usb_max_devs++; + } } } } -- 1.7.1

3 3

[U-Boot] [PATCH v2] usb_storage : scan all interfaces to find a storage device
by franck.jullien＠gmail.com 04 Mar '15

04 Mar '15

From: Franck Jullien <franck.jullien(a)gmail.com> Mass storage is not necessary present on interface 0. This patch allow usb_stor_scan to look in every available interface. Signed-off-by: Franck Jullien <franck.jullien(a)gmail.com> --- v2: create a new function to improve indentation common/usb_storage.c | 45 ++++++++++++++++++++++++++++----------------- 1 files changed, 28 insertions(+), 17 deletions(-) diff --git a/common/usb_storage.c b/common/usb_storage.c index 1411737..8a490d3 100644 --- a/common/usb_storage.c +++ b/common/usb_storage.c @@ -208,6 +208,30 @@ static unsigned int usb_get_max_lun(struct us_data *us) return (len > 0) ? *result : 0; } +static int usb_storage_register(struct usb_device *dev, unsigned char iface) +{ + int lun, max_lun, start = usb_max_devs; + int nb_dev = 0; + + if (usb_storage_probe(dev, iface, &usb_stor[usb_max_devs])) { + /* OK, it's a storage device. Iterate over its LUNs + * and populate `usb_dev_desc'. + */ + max_lun = usb_get_max_lun(&usb_stor[usb_max_devs]); + for (lun = 0; + lun <= max_lun && usb_max_devs < USB_MAX_STOR_DEV; + lun++) { + usb_dev_desc[usb_max_devs].lun = lun; + if (usb_stor_get_info(dev, &usb_stor[start], + &usb_dev_desc[usb_max_devs]) == 1) { + nb_dev++; + } + } + } + + return nb_dev; +} + /******************************************************************************* * scan the usb and reports device info * to the user if mode = 1 @@ -215,7 +239,7 @@ static unsigned int usb_get_max_lun(struct us_data *us) */ int usb_stor_scan(int mode) { - unsigned char i; + unsigned char i, iface; struct usb_device *dev; if (mode == 1) @@ -241,23 +265,10 @@ int usb_stor_scan(int mode) if (dev == NULL) break; /* no more devices available */ - if (usb_storage_probe(dev, 0, &usb_stor[usb_max_devs])) { - /* OK, it's a storage device. Iterate over its LUNs - * and populate `usb_dev_desc'. - */ - int lun, max_lun, start = usb_max_devs; - - max_lun = usb_get_max_lun(&usb_stor[usb_max_devs]); - for (lun = 0; - lun <= max_lun && usb_max_devs < USB_MAX_STOR_DEV; - lun++) { - usb_dev_desc[usb_max_devs].lun = lun; - if (usb_stor_get_info(dev, &usb_stor[start], - &usb_dev_desc[usb_max_devs]) == 1) { - usb_max_devs++; - } - } + for (iface = 0; iface < dev->config.no_of_if; iface++) { + usb_max_devs += usb_storage_register(dev, iface); } + /* if storage device */ if (usb_max_devs == USB_MAX_STOR_DEV) { printf("max USB Storage Device reached: %d stopping\n", -- 1.7.1

2 1

[U-Boot] [PATCH 0/3] samsung: board: reserve dram for the secure firmware
by Przemyslaw Marczak 04 Mar '15

04 Mar '15

Since the few exynos based boards requires memory reservation, of last DRAM bank, the code could be in a common place. This patchset moves the reservation code from odroid board file to common samsung board file. Przemyslaw Marczak (3): board: samsung: reserve memory for the secure firmware Odroid-XU3: enable the last dram bank and reserve 22MiB Odroid U3: use common code for dram reservation board/samsung/common/board.c | 6 ++++++ board/samsung/odroid/odroid.c | 4 ---- include/configs/odroid.h | 5 +++-- include/configs/odroid_xu3.h | 10 ++++------ 4 files changed, 13 insertions(+), 12 deletions(-) -- 1.9.1

2 5

[U-Boot] [PATCH] samsung: board: fix: Define loop iterator as an unsigned int to suppress gcc 4.8 warning
by Lukasz Majewski 04 Mar '15

04 Mar '15

This patch suppress following warning: board/samsung/common/board.c:95:32: warning: iteration 4u invokes undefined behavior [-Waggressive-loop-optimizations] addr = CONFIG_SYS_SDRAM_BASE + (i * SDRAM_BANK_SIZE); ^ board/samsung/common/board.c:94:2: note: containing loop about possible signed integer overflow at gcc 4.8.2 (odroid board) Signed-off-by: Lukasz Majewski <l.majewski(a)samsung.com> --- board/samsung/common/board.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/samsung/common/board.c b/board/samsung/common/board.c index 7b10877..d8cf5ab 100644 --- a/board/samsung/common/board.c +++ b/board/samsung/common/board.c @@ -89,7 +89,7 @@ int board_init(void) int dram_init(void) { - int i; + unsigned int i; u32 addr; for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) { @@ -101,7 +101,7 @@ int dram_init(void) void dram_init_banksize(void) { - int i; + unsigned int i; u32 addr, size; for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) { -- 2.0.0.rc2

2 1

[U-Boot] lcd-console / display rotation
by Hannes Petermaier 04 Mar '15

04 Mar '15

Hello everybody, A short question about lcd-console: Today u-boot only supports a 'linear framebuffer', meaning the next pixel of a character is allways right after left and the framebuffer address is incrementing. We call this the display is mounted with 0° rotation. In some cases we have a rotated display. Maybe rotated by 90° to have portrait mode or even 180° due to mechanical issues. My question is: Is anybody currently working around this, having rotated display ? If not so, i would like start a implementation. 180° is quite easy, we only need to add some offset (total len of framebuffer) to our framebuffer base address and do -- instead ++ for drawing characters. Font can be reused. In the other cases, 90° and 270° it will maybe a bit tricky. I think a ?rotated font? is also necessary. Of course we have to think about the other functions like scroll up/down. best regards, hannes

4 4

[U-Boot] [RFC PATCH 01/13] Use 'U-Boot' instead of 'U-boot' in CONFIG_BOOTP_VCI_STRING
by Simon Glass 04 Mar '15

04 Mar '15

This string seems wrong - U-Boot is normally written with a capital B. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- include/config_distro_defaults.h | 4 ++-- include/configs/ls2085a_common.h | 2 +- include/configs/vexpress_aemv8a.h | 2 +- include/configs/vexpress_ca15_tc2.h | 2 +- include/configs/vexpress_ca5x2.h | 2 +- include/configs/vexpress_ca9x4.h | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/config_distro_defaults.h b/include/config_distro_defaults.h index 1ecc0bb..faf564f 100644 --- a/include/config_distro_defaults.h +++ b/include/config_distro_defaults.h @@ -23,9 +23,9 @@ #if defined(__arm__) #define CONFIG_BOOTP_PXE_CLIENTARCH 0x100 #if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) -#define CONFIG_BOOTP_VCI_STRING "U-boot.armv7" +#define CONFIG_BOOTP_VCI_STRING "U-Boot.armv7" #else -#define CONFIG_BOOTP_VCI_STRING "U-boot.arm" +#define CONFIG_BOOTP_VCI_STRING "U-Boot.arm" #endif #endif diff --git a/include/configs/ls2085a_common.h b/include/configs/ls2085a_common.h index 6fe032c..69de475 100644 --- a/include/configs/ls2085a_common.h +++ b/include/configs/ls2085a_common.h @@ -27,7 +27,7 @@ #define CONFIG_BOARD_EARLY_INIT_F 1 #define CONFIG_IDENT_STRING " LS2085A-EMU" -#define CONFIG_BOOTP_VCI_STRING "U-boot.LS2085A-EMU" +#define CONFIG_BOOTP_VCI_STRING "U-Boot.LS2085A-EMU" /* Flat Device Tree Definitions */ #define CONFIG_OF_LIBFDT diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index 7fb28a5..d4ba4e9 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -38,7 +38,7 @@ #define CONFIG_SYS_ICACHE_OFF #define CONFIG_IDENT_STRING " vexpress_aemv8a" -#define CONFIG_BOOTP_VCI_STRING "U-boot.armv8.vexpress_aemv8a" +#define CONFIG_BOOTP_VCI_STRING "U-Boot.armv8.vexpress_aemv8a" /* Link Definitions */ #ifdef CONFIG_TARGET_VEXPRESS64_BASE_FVP diff --git a/include/configs/vexpress_ca15_tc2.h b/include/configs/vexpress_ca15_tc2.h index b43afa2..3c9777f 100644 --- a/include/configs/vexpress_ca15_tc2.h +++ b/include/configs/vexpress_ca15_tc2.h @@ -13,7 +13,7 @@ #define CONFIG_VEXPRESS_EXTENDED_MEMORY_MAP #include "vexpress_common.h" -#define CONFIG_BOOTP_VCI_STRING "U-boot.armv7.vexpress_ca15x2_tc2" +#define CONFIG_BOOTP_VCI_STRING "U-Boot.armv7.vexpress_ca15x2_tc2" #define CONFIG_SYSFLAGS_ADDR 0x1c010030 #define CONFIG_SMP_PEN_ADDR CONFIG_SYSFLAGS_ADDR diff --git a/include/configs/vexpress_ca5x2.h b/include/configs/vexpress_ca5x2.h index 7719d59..6c160a5 100644 --- a/include/configs/vexpress_ca5x2.h +++ b/include/configs/vexpress_ca5x2.h @@ -13,6 +13,6 @@ #define CONFIG_VEXPRESS_EXTENDED_MEMORY_MAP #include "vexpress_common.h" -#define CONFIG_BOOTP_VCI_STRING "U-boot.armv7.vexpress_ca5x2" +#define CONFIG_BOOTP_VCI_STRING "U-Boot.armv7.vexpress_ca5x2" #endif /* __VEXPRESS_CA5X2_h */ diff --git a/include/configs/vexpress_ca9x4.h b/include/configs/vexpress_ca9x4.h index 38ac4ed..564521e 100644 --- a/include/configs/vexpress_ca9x4.h +++ b/include/configs/vexpress_ca9x4.h @@ -13,6 +13,6 @@ #define CONFIG_VEXPRESS_ORIGINAL_MEMORY_MAP #include "vexpress_common.h" -#define CONFIG_BOOTP_VCI_STRING "U-boot.armv7.vexpress_ca9x4" +#define CONFIG_BOOTP_VCI_STRING "U-Boot.armv7.vexpress_ca9x4" #endif /* VEXPRESS_CA9X4_H */ -- 2.2.0.rc0.207.ga3a616c

5 33

[U-Boot] "Error: selected processor does not support `bx lr'" when compiling u-boot-2015.01 with SCB9328 config, 2014.01 works
by Markus Rudolf 04 Mar '15

04 Mar '15

I tried the following: armdev@armdev-vm:~/Development/u-boot-2015.01$ export ARCH=arm armdev@armdev-vm:~/Development/u-boot-2015.01$ export CROSS_COMPILE=/opt/OSELAS.Toolchain-trunk/arm-v4t-linux-gnueabi/gcc-4.1.2-glibc-2.5-binutils-2.17-kernel-2.6.18/bin/arm-v4t-linux-gnueabi- armdev@armdev-vm:~/Development/u-boot-2015.01$ make distclean CLEAN tools CLEAN tools/lib tools/common CLEAN scripts/basic CLEAN scripts/kconfig CLEAN include/config include/generated CLEAN .config include/autoconf.mk include/autoconf.mk.dep include/config.h armdev@armdev-vm:~/Development/u-boot-2015.01$ make scb9328_defconfig HOSTCC scripts/basic/fixdep HOSTCC scripts/kconfig/conf.o SHIPPED scripts/kconfig/zconf.tab.c SHIPPED scripts/kconfig/zconf.lex.c SHIPPED scripts/kconfig/zconf.hash.c HOSTCC scripts/kconfig/zconf.tab.o HOSTLD scripts/kconfig/conf # # configuration written to .config # armdev@armdev-vm:~/Development/u-boot-2015.01$ make all scripts/kconfig/conf --silentoldconfig Kconfig CHK include/config.h UPD include/config.h GEN include/autoconf.mk GEN include/autoconf.mk.dep CHK include/config/uboot.release UPD include/config/uboot.release CHK include/generated/version_autogenerated.h UPD include/generated/version_autogenerated.h CHK include/generated/timestamp_autogenerated.h UPD include/generated/timestamp_autogenerated.h CC lib/asm-offsets.s GEN include/generated/generic-asm-offsets.h CC arch/arm/lib/asm-offsets.s GEN include/generated/asm-offsets.h HOSTCC tools/envcrc.o WRAP tools/lib/crc32.c HOSTCC tools/lib/crc32.o WRAP tools/common/env_embedded.c HOSTCC tools/common/env_embedded.o WRAP tools/lib/sha1.c HOSTCC tools/lib/sha1.o HOSTLD tools/envcrc HOSTCC tools/gen_eth_addr HOSTCC tools/mkenvimage.o HOSTCC tools/os_support.o HOSTLD tools/mkenvimage HOSTCC tools/aisimage.o HOSTCC tools/atmelimage.o WRAP tools/common/bootm.c HOSTCC tools/common/bootm.o HOSTCC tools/default_image.o WRAP tools/lib/fdtdec_common.c HOSTCC tools/lib/fdtdec_common.o WRAP tools/lib/fdtdec.c HOSTCC tools/lib/fdtdec.o HOSTCC tools/fit_common.o HOSTCC tools/fit_image.o HOSTCC tools/gpimage.o HOSTCC tools/gpimage-common.o WRAP tools/common/image-fit.c HOSTCC tools/common/image-fit.o HOSTCC tools/image-host.o WRAP tools/common/image.c HOSTCC tools/common/image.o HOSTCC tools/imagetool.o HOSTCC tools/imximage.o HOSTCC tools/kwbimage.o WRAP tools/lib/md5.c HOSTCC tools/lib/md5.o HOSTCC tools/mxsimage.o HOSTCC tools/omapimage.o HOSTCC tools/pblimage.o HOSTCC tools/pbl_crc32.o HOSTCC tools/socfpgaimage.o WRAP tools/lib/sha256.c HOSTCC tools/lib/sha256.o HOSTCC tools/ublimage.o WRAP tools/lib/libfdt/fdt.c HOSTCC tools/lib/libfdt/fdt.o WRAP tools/lib/libfdt/fdt_ro.c HOSTCC tools/lib/libfdt/fdt_ro.o WRAP tools/lib/libfdt/fdt_rw.c HOSTCC tools/lib/libfdt/fdt_rw.o WRAP tools/lib/libfdt/fdt_strerror.c HOSTCC tools/lib/libfdt/fdt_strerror.o WRAP tools/lib/libfdt/fdt_wip.c HOSTCC tools/lib/libfdt/fdt_wip.o HOSTCC tools/dumpimage.o HOSTLD tools/dumpimage HOSTCC tools/mkimage.o HOSTLD tools/mkimage HOSTCC tools/proftool LD arch/arm/cpu/built-in.o CC arch/arm/cpu/arm920t/cpu.o CC arch/arm/cpu/arm920t/imx/generic.o CC arch/arm/cpu/arm920t/imx/speed.o CC arch/arm/cpu/arm920t/imx/timer.o LD arch/arm/cpu/arm920t/imx/built-in.o LD arch/arm/cpu/arm920t/built-in.o AS arch/arm/cpu/arm920t/start.o AS arch/arm/lib/vectors.o AS arch/arm/lib/crt0.o AS arch/arm/lib/relocate.o arch/arm/lib/relocate.S: Assembler messages: arch/arm/lib/relocate.S:50: Error: selected processor does not support `bx lr' make[1]: *** [arch/arm/lib/relocate.o] Error 1 make: *** [arch/arm/lib] Error 2 armdev@armdev-vm:~/Development/u-boot-2015.01$ I tried the same steps with export arch=armv4 and armv4t as well which didn't make any difference. Can someone point me into the right direction? I would prefer stay with this toolchain, because I need to support a fairly old LINUX and userland with it and just wanna update the u-boot on my SCB9328 to get rid of some issues with newer JFFS2 flags not supported by my current 1.12 uboot on the board. I just tested: uboot 2014.01 compiles with the same settings and toolchain. So I guess it broke somewhere in between. I can try to pinpoint it if it helps. Markus

1 0

[U-Boot] [PATCH] arm: rmobile: alt: Add ethernet function B support
by Nobuhiro Iwamatsu 04 Mar '15

04 Mar '15

From: Mitsuhiro Kimura <mitsuhiro.kimura.kc(a)renesas.com> Ethernet function of Alt board can select normal and B by DIP switch on board. But user need to set not only DIP switch but also pin function. This adds pin function of Ethernet function B. This can select from Kconfig. Signed-off-by: Mitsuhiro Kimura <mitsuhiro.kimura.kc(a)renesas.com> Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj(a)renesas.com> --- board/renesas/alt/Kconfig | 9 +++++++++ board/renesas/alt/alt.c | 17 ++++++++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/board/renesas/alt/Kconfig b/board/renesas/alt/Kconfig index 957962d..39d53c1 100644 --- a/board/renesas/alt/Kconfig +++ b/board/renesas/alt/Kconfig @@ -9,4 +9,13 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "alt" +config R8A7794_ETHERNET_B + bool "Use ethernet B function" + depends on TARGET_ALT + default n + help + ALT board can use default ethernet and etnernet B function. + This config set pin function of ethenet B. You also needt to change + DIP switch of board in order to use this function. + endif diff --git a/board/renesas/alt/alt.c b/board/renesas/alt/alt.c index f0010db..3501a17 100644 --- a/board/renesas/alt/alt.c +++ b/board/renesas/alt/alt.c @@ -1,7 +1,7 @@ /* * board/renesas/alt/alt.c * - * Copyright (C) 2014 Renesas Electronics Corporation + * Copyright (C) 2014, 2015 Renesas Electronics Corporation * * SPDX-License-Identifier: GPL-2.0 */ @@ -94,6 +94,20 @@ int board_init(void) r8a7794_pinmux_init(); /* Ether Enable */ +#if defined(CONFIG_R8A7794_ETHERNET_B) + gpio_request(GPIO_FN_ETH_CRS_DV_B, NULL); + gpio_request(GPIO_FN_ETH_RX_ER_B, NULL); + gpio_request(GPIO_FN_ETH_RXD0_B, NULL); + gpio_request(GPIO_FN_ETH_RXD1_B, NULL); + gpio_request(GPIO_FN_ETH_LINK_B, NULL); + gpio_request(GPIO_FN_ETH_REFCLK_B, NULL); + gpio_request(GPIO_FN_ETH_MDIO_B, NULL); + gpio_request(GPIO_FN_ETH_TXD1_B, NULL); + gpio_request(GPIO_FN_ETH_TX_EN_B, NULL); + gpio_request(GPIO_FN_ETH_MAGIC_B, NULL); + gpio_request(GPIO_FN_ETH_TXD0_B, NULL); + gpio_request(GPIO_FN_ETH_MDC_B, NULL); +#else gpio_request(GPIO_FN_ETH_CRS_DV, NULL); gpio_request(GPIO_FN_ETH_RX_ER, NULL); gpio_request(GPIO_FN_ETH_RXD0, NULL); @@ -106,6 +120,7 @@ int board_init(void) gpio_request(GPIO_FN_ETH_MAGIC, NULL); gpio_request(GPIO_FN_ETH_TXD0, NULL); gpio_request(GPIO_FN_ETH_MDC, NULL); +#endif gpio_request(GPIO_FN_IRQ8, NULL); /* PHY reset */ -- 2.1.3

1 0