October 2014 - U-Boot

[U-Boot] [ANN] U-Boot v2014.10-rc3 released
by Tom Rini 08 Oct '14

08 Oct '14

Hey all, I've pushed v2014.10-rc4 out to the repository and tarballs should exist soon. I've lagged a bit behind in tagging this, but I think we'll be alright in the end. I've made http://patchwork.ozlabs.org/bundle/trini/for-v2014.10-release/ for what I intend to get in to the release. If something is in patchwork and not in there, please reply here and let me know. As always, if anything is broken please speak up. Thanks all! -- Tom

3 2

[U-Boot] [PATCH 1/4] Add snoop disable for slave port 0, port 1 and port 2
by Alison Wang 08 Oct '14

08 Oct '14

From: Jason Jin <Jason.Jin(a)freescale.com> Disable the snoop for slave interface 0, 1 and 2 to avoid the interleaving on the CCI400 BUS. Signed-off-by: Jason Jin <Jason.Jin(a)freescale.com> Signed-off-by: Minghuan Lian <Minghuan.Lian(a)freescale.com> --- arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h | 1 + board/freescale/ls1021aqds/ls1021aqds.c | 7 +++++++ board/freescale/ls1021atwr/ls1021atwr.c | 10 ++++++++++ 3 files changed, 18 insertions(+) diff --git a/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h b/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h index 7995fe2..a1f4fdb 100644 --- a/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h +++ b/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h @@ -448,6 +448,7 @@ struct ccsr_ddr { #define CCI400_CTRLORD_TERM_BARRIER 0x00000008 #define CCI400_CTRLORD_EN_BARRIER 0 +#define CCI400_SHAORD_NON_SHAREABLE 0x00000002 /* CCI-400 registers */ struct ccsr_cci400 { diff --git a/board/freescale/ls1021aqds/ls1021aqds.c b/board/freescale/ls1021aqds/ls1021aqds.c index 12e83f7..e32dbeb 100644 --- a/board/freescale/ls1021aqds/ls1021aqds.c +++ b/board/freescale/ls1021aqds/ls1021aqds.c @@ -220,6 +220,13 @@ int board_init(void) /* Set CCI-400 control override register to * enable barrier transaction */ out_le32(&cci->ctrl_ord, CCI400_CTRLORD_EN_BARRIER); + /* + * Set CCI-400 Slave interface S0, S1, S2 Shareable Override Register + * All transactions are treated as non-shareable + */ + out_le32(&cci->slave[0].sha_ord, CCI400_SHAORD_NON_SHAREABLE); + out_le32(&cci->slave[1].sha_ord, CCI400_SHAORD_NON_SHAREABLE); + out_le32(&cci->slave[2].sha_ord, CCI400_SHAORD_NON_SHAREABLE); select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT); diff --git a/board/freescale/ls1021atwr/ls1021atwr.c b/board/freescale/ls1021atwr/ls1021atwr.c index b522ff2..811c911 100644 --- a/board/freescale/ls1021atwr/ls1021atwr.c +++ b/board/freescale/ls1021atwr/ls1021atwr.c @@ -272,6 +272,16 @@ int board_early_init_f(void) int board_init(void) { + struct ccsr_cci400 *cci = (struct ccsr_cci400 *)CONFIG_SYS_CCI400_ADDR; + + /* + * Set CCI-400 Slave interface S0, S1, S2 Shareable Override Register + * All transactions are treated as non-shareable + */ + out_le32(&cci->slave[0].sha_ord, CCI400_SHAORD_NON_SHAREABLE); + out_le32(&cci->slave[1].sha_ord, CCI400_SHAORD_NON_SHAREABLE); + out_le32(&cci->slave[2].sha_ord, CCI400_SHAORD_NON_SHAREABLE); + #ifndef CONFIG_SYS_FSL_NO_SERDES fsl_serdes_init(); config_serdes_mux(); -- 2.1.0.27.g96db324

4 8

[U-Boot] [PATCH v3 0/2] Introduce CONFIG_SUPPORT_SPL/TPL
by Masahiro Yamada 08 Oct '14

08 Oct '14

Masahiro Yamada (2): kconfig: add CONFIG_SUPPORT_SPL kconfig: add CONFIG_SUPPORT_TPL Kconfig | 9 ++++++- arch/arm/Kconfig | 45 ++++++++++++++++++++++++++++++++++ arch/arm/cpu/arm926ejs/davinci/Kconfig | 4 +++ arch/arm/cpu/armv7/exynos/Kconfig | 7 ++++++ arch/arm/cpu/armv7/omap3/Kconfig | 16 ++++++++++++ arch/microblaze/Kconfig | 1 + arch/powerpc/cpu/mpc5xxx/Kconfig | 1 + arch/powerpc/cpu/mpc83xx/Kconfig | 1 + arch/powerpc/cpu/mpc85xx/Kconfig | 17 +++++++++++++ arch/powerpc/cpu/ppc4xx/Kconfig | 1 + 10 files changed, 101 insertions(+), 1 deletion(-) -- 1.9.1

1 2

[U-Boot] [PATCH v5 0/15] samsung: Use common config files with Samsung boards
by Simon Glass 08 Oct '14

08 Oct '14

This series tries to unify the Samsung board configs into a few header files for exynos5 and exynos4. The purpose is to make it easier to move to driver model. In that case I would like things like the GPIO drivers and serial drivers to work in a standard way, and not need to support device tree and platform data at the same time. That would be quite painful. Another reason is that the Chrome OS EC drivers are currently included in boards that don't have a Chrome OS EC. This concern was raised by the Samsung maintainer (Minkyu) a while back. There are still a few boards that don't use CONFIG_OF_CONTROL so I have updated these rudimentary of device tree files based on feedback. This series has the side-effect of getting the EC interface working properly on Pit, so the keyboard works. It also provides access to the TPS65090 PMIC, which means that the backlight is enabled. Changes in v5: - Rebase on top of samsung/master Changes in v4: - Address review nits from Minkyu - Make this driver more like the one it came from - Rebase on top of master (CONFIG_OF settings moved to Kconfig) - Remove special FET_ERR_NOT_READY etc. as use standard errors Changes in v3: - Adjust device tree file based on Robert Baldyga's example Changes in v2: - Add new patch to enable keyboard on pit - Add new patch to split out cros_ec drivers - Add new patch to use 900MHz ARM frequeny in SPL for peach_pit - Avoid using a common file, and just add a device tree - Don't enable the cros_ec on smdk5420 - Fix 'cashe' typo in commit subject - Fix device tree base addresses - Leave CONFIG_SERIAL3 in the individual board files - Leave in a few configs which are not in fact common to all boards - Reduce the number of common elements to avoid needing #undefs later - Slightly reword the commit message Simon Glass (15): Exynos: Use 900MHz ARM frequency in SPL for peach_pit exynos5: Enable data cache cros_ec: power: Add a tunnelled version of the tps65090 driver cros_ec: exynos: Use the correct tps65090 driver in each case dm: exynos: Split out the cros_ec drivers exynos: dts: Add device tree node for cros_ec keyboard exynos: Rename -dt config files to -common exynos: Move common exynos settings into a common file exynos: Move common smdk5420 things to common file exynos: config: Move cros_ec and tps65090 out of smdk boards config: Move arndale to use common exynos5250 file config: Move smdkv310 to use common exynos4 file samsung: Enable device tree for s5p_goni samsung: Enable device tree for smdkc100 exynos: Enable pre-relocation malloc() arch/arm/Kconfig | 13 +- arch/arm/cpu/armv7/s5pc1xx/Kconfig | 24 +++ arch/arm/dts/Makefile | 3 + arch/arm/dts/exynos4210-smdkv310.dts | 21 ++ arch/arm/dts/exynos5420-peach-pit.dts | 57 +++++- arch/arm/dts/s5pc1xx-goni.dts | 28 +++ arch/arm/dts/s5pc1xx-smdkc100.dts | 29 +++ arch/arm/include/asm/arch-s5pc1xx/periph.h | 61 ++++++ arch/arm/include/asm/arch-s5pc1xx/pinmux.h | 50 +++++ configs/s5p_goni_defconfig | 1 + configs/smdkc100_defconfig | 1 + drivers/mmc/s5p_sdhci.c | 2 - drivers/power/pmic/Makefile | 3 +- drivers/power/pmic/pmic_tps65090_ec.c | 218 +++++++++++++++++++++ include/configs/arndale.h | 197 +------------------ include/configs/{exynos4-dt.h => exynos-common.h} | 110 +++-------- include/configs/exynos4-common.h | 71 +++++++ include/configs/{exynos5-dt.h => exynos5-common.h} | 126 ++---------- include/configs/exynos5-dt-common.h | 35 ++++ .../{exynos5250-dt.h => exynos5250-common.h} | 7 +- .../configs/{exynos5420.h => exynos5420-common.h} | 22 ++- include/configs/odroid.h | 4 +- include/configs/origen.h | 5 +- include/configs/peach-pit.h | 16 +- include/configs/s5p_goni.h | 12 +- include/configs/s5pc210_universal.h | 5 +- include/configs/smdk5250.h | 23 ++- include/configs/smdk5420.h | 5 +- include/configs/smdkc100.h | 9 + include/configs/smdkv310.h | 63 ++---- include/configs/snow.h | 25 ++- include/configs/trats.h | 6 +- include/configs/trats2.h | 6 +- 33 files changed, 764 insertions(+), 494 deletions(-) create mode 100644 arch/arm/cpu/armv7/s5pc1xx/Kconfig create mode 100644 arch/arm/dts/exynos4210-smdkv310.dts create mode 100644 arch/arm/dts/s5pc1xx-goni.dts create mode 100644 arch/arm/dts/s5pc1xx-smdkc100.dts create mode 100644 arch/arm/include/asm/arch-s5pc1xx/periph.h create mode 100644 arch/arm/include/asm/arch-s5pc1xx/pinmux.h create mode 100644 drivers/power/pmic/pmic_tps65090_ec.c rename include/configs/{exynos4-dt.h => exynos-common.h} (50%) create mode 100644 include/configs/exynos4-common.h rename include/configs/{exynos5-dt.h => exynos5-common.h} (65%) create mode 100644 include/configs/exynos5-dt-common.h rename include/configs/{exynos5250-dt.h => exynos5250-common.h} (88%) rename include/configs/{exynos5420.h => exynos5420-common.h} (71%) -- 2.1.0.rc2.206.gedb03e5

2 21

[U-Boot] [PATCH] ARM: LS1021A: Configure device stream id for smmu.
by Xiubo Li 08 Oct '14

08 Oct '14

Signed-off-by: Xiubo Li <Li.Xiubo(a)freescale.com> --- .../include/asm/arch-ls102xa/ls102xa_stream_id.h | 17 +++++++++++++++++ board/freescale/common/Makefile | 2 ++ board/freescale/common/ls102xa_stream_id.c | 19 +++++++++++++++++++ board/freescale/ls1021aqds/ls1021aqds.c | 22 ++++++++++++++++++++++ board/freescale/ls1021atwr/ls1021atwr.c | 22 ++++++++++++++++++++++ include/configs/ls1021aqds.h | 2 ++ include/configs/ls1021atwr.h | 2 ++ 7 files changed, 86 insertions(+) create mode 100644 arch/arm/include/asm/arch-ls102xa/ls102xa_stream_id.h create mode 100644 board/freescale/common/ls102xa_stream_id.c diff --git a/arch/arm/include/asm/arch-ls102xa/ls102xa_stream_id.h b/arch/arm/include/asm/arch-ls102xa/ls102xa_stream_id.h new file mode 100644 index 0000000..abd70fc --- /dev/null +++ b/arch/arm/include/asm/arch-ls102xa/ls102xa_stream_id.h @@ -0,0 +1,17 @@ +/* + * Copyright 2014 Freescale Semiconductor, Inc. + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef __FSL_LS102XA_STREAM_ID_H_ +#define __FSL_LS102XA_STREAM_ID_H_ + +struct smmu_stream_id { + uint16_t offset; + uint16_t stream_id; + char dev_name[32]; +}; + +void ls102xa_config_smmu_stream_id(struct smmu_stream_id *id, uint32_t num); +#endif diff --git a/board/freescale/common/Makefile b/board/freescale/common/Makefile index 7296bbb..726f52c 100644 --- a/board/freescale/common/Makefile +++ b/board/freescale/common/Makefile @@ -54,6 +54,8 @@ obj-$(CONFIG_VSC_CROSSBAR) += vsc3316_3308.o obj-$(CONFIG_IDT8T49N222A) += idt8t49n222a_serdes_clk.o obj-$(CONFIG_ZM7300) += zm7300.o +obj-$(CONFIG_LS102XA_STREAM_ID) += ls102xa_stream_id.o + # deal with common files for P-series corenet based devices obj-$(CONFIG_P2041RDB) += p_corenet/ obj-$(CONFIG_P3041DS) += p_corenet/ diff --git a/board/freescale/common/ls102xa_stream_id.c b/board/freescale/common/ls102xa_stream_id.c new file mode 100644 index 0000000..dd0c710 --- /dev/null +++ b/board/freescale/common/ls102xa_stream_id.c @@ -0,0 +1,19 @@ +/* + * Copyright 2014 Freescale Semiconductor + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> +#include <asm/io.h> +#include <asm/arch/ls102xa_stream_id.h> + +void ls102xa_config_smmu_stream_id(struct smmu_stream_id *id, uint32_t num) +{ + uint32_t *scfg = (uint32_t *)CONFIG_SYS_FSL_SCFG_ADDR; + int i; + + for (i = 0; i < num; i++) { + out_be32(scfg + id[i].offset, id[i].stream_id); + } +} diff --git a/board/freescale/ls1021aqds/ls1021aqds.c b/board/freescale/ls1021aqds/ls1021aqds.c index 07df7d2..2021411 100644 --- a/board/freescale/ls1021aqds/ls1021aqds.c +++ b/board/freescale/ls1021aqds/ls1021aqds.c @@ -11,6 +11,7 @@ #include <asm/arch/ns_access.h> #include <asm/arch/clock.h> #include <asm/arch/fsl_serdes.h> +#include <asm/arch/ls102xa_stream_id.h> #include <mmc.h> #include <fsl_esdhc.h> #include <fsl_ifc.h> @@ -300,6 +301,24 @@ static struct csu_ns_dev ns_dev[] = { }; #endif +struct smmu_stream_id dev_stream_id[] = +{ + { 0x100, 0x01, "ETSEC MAC1" }, + { 0x104, 0x02, "ETSEC MAC2" }, + { 0x108, 0x03, "ETSEC MAC3" }, + { 0x10c, 0x04, "PEX1" }, + { 0x110, 0x05, "PEX2" }, + { 0x114, 0x06, "qDMA" }, + { 0x118, 0x07, "SATA" }, + { 0x11c, 0x08, "USB3" }, + { 0x120, 0x09, "QE" }, + { 0x124, 0x0a, "eSDHC" }, + { 0x128, 0x0b, "eMA" }, + { 0x14c, 0x0c, "2D-ACE" }, + { 0x150, 0x0d, "USB2" }, + { 0x18c, 0x0e, "DEBUG" }, +}; + int board_init(void) { struct ccsr_cci400 *cci = (struct ccsr_cci400 *)CONFIG_SYS_CCI400_ADDR; @@ -315,6 +334,9 @@ int board_init(void) config_serdes_mux(); #endif + ls102xa_config_smmu_stream_id(dev_stream_id, + ARRAY_SIZE(dev_stream_id)); + #ifdef CONFIG_SYS_FSL_CSU_ADDR enable_devices_ns_access(ns_dev, ARRAY_SIZE(ns_dev)); #endif diff --git a/board/freescale/ls1021atwr/ls1021atwr.c b/board/freescale/ls1021atwr/ls1021atwr.c index c4d3600..3281277 100644 --- a/board/freescale/ls1021atwr/ls1021atwr.c +++ b/board/freescale/ls1021atwr/ls1021atwr.c @@ -11,6 +11,7 @@ #include <asm/arch/ns_access.h> #include <asm/arch/clock.h> #include <asm/arch/fsl_serdes.h> +#include <asm/arch/ls102xa_stream_id.h> #include <mmc.h> #include <fsl_esdhc.h> #include <fsl_ifc.h> @@ -357,6 +358,24 @@ static struct csu_ns_dev ns_dev[] = { }; #endif +struct smmu_stream_id dev_stream_id[] = +{ + { 0x100, 0x01, "ETSEC MAC1" }, + { 0x104, 0x02, "ETSEC MAC2" }, + { 0x108, 0x03, "ETSEC MAC3" }, + { 0x10c, 0x04, "PEX1" }, + { 0x110, 0x05, "PEX2" }, + { 0x114, 0x06, "qDMA" }, + { 0x118, 0x07, "SATA" }, + { 0x11c, 0x08, "USB3" }, + { 0x120, 0x09, "QE" }, + { 0x124, 0x0a, "eSDHC" }, + { 0x128, 0x0b, "eMA" }, + { 0x14c, 0x0c, "2D-ACE" }, + { 0x150, 0x0d, "USB2" }, + { 0x18c, 0x0e, "DEBUG" }, +}; + int board_init(void) { #ifndef CONFIG_SYS_FSL_NO_SERDES @@ -364,6 +383,9 @@ int board_init(void) config_serdes_mux(); #endif + ls102xa_config_smmu_stream_id(dev_stream_id, + ARRAY_SIZE(dev_stream_id)); + #ifdef CONFIG_SYS_FSL_CSU_ADDR enable_devices_ns_access(ns_dev, ARRAY_SIZE(ns_dev)); #endif diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 0203dd9..9a7ef64 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -367,6 +367,8 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_LOAD_ADDR 0x82000000 #define CONFIG_SYS_HZ 1000 +#define CONFIG_LS102XA_STREAM_ID + /* * Stack sizes * The stack sizes are set up in start.S using the settings below diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 3d3f109..f81b236 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -269,6 +269,8 @@ #define CONFIG_SYS_LOAD_ADDR 0x82000000 #define CONFIG_SYS_HZ 1000 +#define CONFIG_LS102XA_STREAM_ID + /* * Stack sizes * The stack sizes are set up in start.S using the settings below -- 2.1.0.27.g96db324

1 0

[U-Boot] [PATCH v2 0/4] x86: Enable FIT images on x86
by Simon Glass 08 Oct '14

08 Oct '14

This little series adds support for booting FITs on x86. A FIT is a single file that can contain a kernel, device tree and ramdisk. x86 kernels require a setup.bin file to boot. Rather than try to pack this into the image in a clever way, this series just adds it as another image in the FIT. At present compression is not supported for the setup binary. The kernel image can be compressed using FIT's normal compression options, such as bzip2 and lzo. U-Boot will decompress it as part of the 'bootm' command. More work is needed to make this implementation also support a zImage (which contains a setup.bin and a compressed kernel in a single image) in the FIT. The full series is available at: http://git.denx.de/u-boot-x86.git in branch 'working'. Changes in v2: - Correct setup of setup.bin file - Move license header to SPDX - Add a README to explain how to use this feature - Correct addresses in kernel.its example file Simon Glass (4): x86: Enable LMB and RAMDISK_HIGH by default x86: Rewrite bootm.c to make it similar to ARM x86: Allow cmdline setup in setup_zimage() to be optional x86: Support loading kernel setup from a FIT arch/x86/include/asm/bootm.h | 12 ++ arch/x86/include/asm/config.h | 3 + arch/x86/lib/bootm.c | 151 +++++++++++++++++------ arch/x86/lib/zimage.c | 41 +++---- common/bootm.c | 23 +++- common/cmd_bootm.c | 1 + common/image-fit.c | 24 +++- common/image.c | 11 ++ doc/uImage.FIT/kernel.its | 50 ++++++++ doc/uImage.FIT/source_file_format.txt | 19 +-- doc/uImage.FIT/x86-fit-boot.txt | 220 ++++++++++++++++++++++++++++++++++ include/bootstage.h | 3 + include/image.h | 13 ++ 13 files changed, 498 insertions(+), 73 deletions(-) create mode 100644 arch/x86/include/asm/bootm.h create mode 100644 doc/uImage.FIT/x86-fit-boot.txt -- 2.1.0.rc2.206.gedb03e5

1 4

[U-Boot] [PATCH 1/2] net: Add a command to access the EEPROM from ethernet devices
by Alban Bedel 07 Oct '14

07 Oct '14

Many ethernet devices use an EEPROM to store various settings, most commonly the device MAC address. But on some devices it can contains a lot more, for example USB device might also have many USB related parameters. This commit add a set of commands to read/write this EEPROM, write a default configuration and read/write the device MAC address. The defaults command allow priming the EEPROM for devices that need more than just a MAC address in the EEPROM. Change-Id: I9f2d15f84b772dc680349c65c89e772780823745 Signed-off-by: Alban Bedel <alban.bedel(a)avionic-design.de> --- common/cmd_net.c | 134 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ include/net.h | 28 ++++++++++++ net/eth.c | 46 +++++++++++++++++++ 3 files changed, 208 insertions(+) diff --git a/common/cmd_net.c b/common/cmd_net.c index 09489d4..f4952d5 100644 --- a/common/cmd_net.c +++ b/common/cmd_net.c @@ -445,3 +445,137 @@ U_BOOT_CMD( ); #endif /* CONFIG_CMD_LINK_LOCAL */ + +#if defined(CONFIG_CMD_ETH_EEPROM) +static int do_eth_eeprom_rw(struct eth_device *dev, + int argc, char * const argv[]) +{ + ulong addr, offset, length = 1; + + if (argc < 4) + return CMD_RET_USAGE; + + addr = simple_strtoul(argv[2], NULL, 16); + offset = simple_strtoul(argv[3], NULL, 16); + if (argc > 4) + length = simple_strtoul(argv[4], NULL, 16); + + if (!strcmp(argv[0], "write")) { + if (eth_eeprom_write(dev, offset, length, (void *)addr)) { + printf("EEPROM write failed\n"); + return CMD_RET_FAILURE; + } + return CMD_RET_SUCCESS; + } else if (!strcmp(argv[0], "read")) { + if (eth_eeprom_read(dev, offset, length, (void *)addr)) { + printf("EEPROM read failed\n"); + return CMD_RET_FAILURE; + } + return CMD_RET_SUCCESS; + } + + return CMD_RET_USAGE; +} + +static int do_eth_eeprom_defaults(struct eth_device *dev, + int argc, char * const argv[]) +{ + if (eth_eeprom_defaults(dev)) { + printf("EEPROM write failed\n"); + return CMD_RET_FAILURE; + } + + return CMD_RET_SUCCESS; +} + +static int do_eth_eeprom_set_mac(struct eth_device *dev, + int argc, char * const argv[]) +{ + u8 mac[6]; + + if (argc < 3) + return CMD_RET_USAGE; + + eth_parse_enetaddr(argv[2], mac); + if (!is_valid_ether_addr(mac)) { + printf("Invalid mac address given\n"); + return CMD_RET_FAILURE; + } + + printf("Writing MAC to EEPROM ....\n"); + if (eth_eeprom_write_mac(dev, mac)) { + printf("EEPROM write failed\n"); + return CMD_RET_FAILURE; + } + + return CMD_RET_SUCCESS; +} + +static int do_eth_eeprom_show_mac(struct eth_device *dev, + int argc, char * const argv[]) +{ + u8 data[6]; + + if (eth_eeprom_read_mac(dev, data)) { + printf("EEPROM read failed\n"); + return CMD_RET_FAILURE; + } + + printf("%pM\n", data); + if (!is_valid_ether_addr(data)) + printf("Warning: MAC address is not valid!\n"); + + return CMD_RET_SUCCESS; +} + +static int do_eth_eeprom(cmd_tbl_t *cmdtp, int flag, int argc, + char * const argv[]) +{ + struct eth_device *dev; + char *endp = NULL; + int index; + + if (argc < 3) + return CMD_RET_USAGE; + + /* Get the ethernet device, by ID or by name */ + index = (int) simple_strtoul(argv[2], &endp, 16); + if (endp > argv[2]) + dev = eth_get_dev_by_index(index); + else + dev = eth_get_dev_by_name(argv[2]); + + if (!dev) { + printf("Ethernet device not found\n"); + return CMD_RET_FAILURE; + } + + if (!strcmp(argv[1], "read") || !strcmp(argv[1], "write")) + return do_eth_eeprom_rw(dev, argc - 1, argv + 1); + if (!strcmp(argv[1], "defaults")) + return do_eth_eeprom_defaults(dev, argc - 1, argv + 1); + if (!strcmp(argv[1], "set_mac")) + return do_eth_eeprom_set_mac(dev, argc - 1, argv + 1); + if (!strcmp(argv[1], "show_mac")) + return do_eth_eeprom_show_mac(dev, argc - 1, argv + 1); + + printf("Unknown sub command: %s\n", argv[1]); + + return CMD_RET_USAGE; +} + +U_BOOT_CMD( + eth_eeprom, 6, 0, do_eth_eeprom, + "access the EEPROM of ethernet devices", + "read dev addr off [size]\n" + " - read 'size' bytes starting at offset 'off' to memory address 'addr'.\n" + "eth_eeprom write dev addr off [size]\n" + " - write 'size' bytes starting at offset 'off' from memory address 'addr'.\n" + "eth_eeprom defaults dev\n" + " - write default settings in the EEPROM.\n" + "eth_eeprom set_mac dev mac\n" + " - set the MAC address in the EEPROM to 'mac'\n" + "eth_eeprom show_mac dev\n" + " - read the MAC address from the EEPROM." +); +#endif diff --git a/include/net.h b/include/net.h index 735b0b9..39ea848 100644 --- a/include/net.h +++ b/include/net.h @@ -92,6 +92,25 @@ struct eth_device { int (*mcast) (struct eth_device *, const u8 *enetaddr, u8 set); #endif int (*write_hwaddr) (struct eth_device *); +#ifdef CONFIG_CMD_ETH_EEPROM + /* Read data from the ethernet device eeprom */ + int (*eeprom_read)(struct eth_device *, + u32 offset, u32 length, u8 *data); + /* Write data to the ethernet device eeprom */ + int (*eeprom_write)(struct eth_device *, + u32 offset, u32 length, u8 *data); + /* Write the default settings to the eeprom */ + int (*eeprom_defaults)(struct eth_device *); + /* Read the MAC stored in the eeprom, if not implemented + * the MAC is assumed to be at the given offset. */ + int (*eeprom_read_mac)(struct eth_device *, u8 *enetaddr); + /* Write the MAC in the eeprom, if not implemented + * the MAC is assumed to be at the given offset. */ + int (*eeprom_write_mac)(struct eth_device *, u8 *enetaddr); + /* Offset of the MAC address for the default implementation. + * Set to a negative value if the MAC is not in the EEPROM. */ + int eeprom_mac_offset; +#endif struct eth_device *next; int index; void *priv; @@ -172,6 +191,15 @@ int eth_mcast_join(IPaddr_t mcast_addr, u8 join); u32 ether_crc(size_t len, unsigned char const *p); #endif +#ifdef CONFIG_CMD_ETH_EEPROM +int eth_eeprom_read(struct eth_device *dev, u32 offset, + u32 length, u8 *data); +int eth_eeprom_write(struct eth_device *dev, u32 offset, + u32 length, u8 *data); +int eth_eeprom_defaults(struct eth_device *dev); +int eth_eeprom_read_mac(struct eth_device *, u8 *enetaddr); +int eth_eeprom_write_mac(struct eth_device *, u8 *enetaddr); +#endif /**********************************************************************/ /* diff --git a/net/eth.c b/net/eth.c index 76ffa05..2cde72c 100644 --- a/net/eth.c +++ b/net/eth.c @@ -542,3 +542,49 @@ char *eth_get_name(void) { return eth_current ? eth_current->name : "unknown"; } + +#ifdef CONFIG_CMD_ETH_EEPROM +int eth_eeprom_read(struct eth_device *dev, u32 offset, + u32 length, u8 *data) +{ + return dev->eeprom_read ? + dev->eeprom_read(dev, offset, length, data) : + -ENOSYS; +} + +int eth_eeprom_write(struct eth_device *dev, u32 offset, + u32 length, u8 *data) +{ + return dev->eeprom_write ? + dev->eeprom_write(dev, offset, length, data) : + -ENOSYS; +} + +int eth_eeprom_defaults(struct eth_device *dev) +{ + return dev->eeprom_defaults ? dev->eeprom_defaults(dev) : + -ENOSYS; +} + +int eth_eeprom_read_mac(struct eth_device *dev, u8 *enetaddr) +{ + if (dev->eeprom_read_mac) + return dev->eeprom_read_mac(dev, enetaddr); + + return dev->eeprom_mac_offset >= 0 ? + eth_eeprom_read(dev, dev->eeprom_mac_offset, + 6, enetaddr) : + -ENOSYS; +} + +int eth_eeprom_write_mac(struct eth_device *dev, u8 *enetaddr) +{ + if (dev->eeprom_write_mac) + return dev->eeprom_write_mac(dev, enetaddr); + + return dev->eeprom_mac_offset >= 0 ? + eth_eeprom_write(dev, dev->eeprom_mac_offset, + 6, enetaddr) : + -ENOSYS; +} +#endif -- 2.1.1

3 5

[U-Boot] Pull request: u-boot-arm/master
by Albert ARIBAUD 07 Oct '14

07 Oct '14

Hi Tom, The following changes since commit be9f643ae6aa9044c60fe80e3a2c10be8371c692: Merge branch 'for-tom' of git://git.denx.de/u-boot-dm (2014-09-26 20:10:48 -0400) are available in the git repository at: git://git.denx.de/u-boot-arm master for you to fetch changes up to c19a8bc5711ec63e905ef91f045a1489f0aa3cb0: vf610twr: Tune DDR initialization settings (2014-10-07 13:08:31 +0200) ---------------------------------------------------------------- Albert ARIBAUD (1): Merge branch 'u-boot-marvell/master' into 'u-boot-arm/master' Anthony Felice (1): vf610twr: Tune DDR initialization settings DrEagle (5): ARM: sheevaplug: change env location ARM: sheevaplug: add MVSATA driver ARM: sheevaplug: add MTD defaults ARM: sheevaplug: redefine MTDPARTS ARM: sheevaplug: add HUSH parser Masahiro Yamada (7): mtd: denali: add Denali controller configs to Kconfig mtd: denali: add Denali NAND driver for SPL serial: add UniPhier serial driver ARM: UniPhier: add UniPhier SoC support code ARM: UniPhier: add Kconfig and defconfig MAINTAINERS: add me as a maintainer of UniPhier platform git-mailrc: add me as a maintainer of UniPhier platform Michael Walle (1): lsxl: convert to generic board and fix typo MAINTAINERS | 9 + arch/arm/Kconfig | 5 + arch/arm/cpu/armv7/uniphier/Kconfig | 32 + arch/arm/cpu/armv7/uniphier/Makefile | 23 + arch/arm/cpu/armv7/uniphier/board_common.c | 32 + arch/arm/cpu/armv7/uniphier/board_late_init.c | 91 ++ arch/arm/cpu/armv7/uniphier/cache_uniphier.c | 154 +++ arch/arm/cpu/armv7/uniphier/cmd_pinmon.c | 33 + arch/arm/cpu/armv7/uniphier/cpu_info.c | 59 ++ arch/arm/cpu/armv7/uniphier/dram_init.c | 37 + arch/arm/cpu/armv7/uniphier/init_page_table.c | 1068 ++++++++++++++++++++ arch/arm/cpu/armv7/uniphier/lowlevel_init.S | 159 +++ arch/arm/cpu/armv7/uniphier/ph1-ld4/Makefile | 10 + arch/arm/cpu/armv7/uniphier/ph1-ld4/bcu_init.c | 33 + arch/arm/cpu/armv7/uniphier/ph1-ld4/board_info.c | 16 + .../armv7/uniphier/ph1-ld4/board_postclk_init.c | 42 + arch/arm/cpu/armv7/uniphier/ph1-ld4/boot-mode.c | 1 + arch/arm/cpu/armv7/uniphier/ph1-ld4/clkrst_init.c | 29 + arch/arm/cpu/armv7/uniphier/ph1-ld4/pinctrl.c | 63 ++ arch/arm/cpu/armv7/uniphier/ph1-ld4/pll_init.c | 189 ++++ arch/arm/cpu/armv7/uniphier/ph1-ld4/pll_spectrum.c | 1 + arch/arm/cpu/armv7/uniphier/ph1-ld4/sbc_init.c | 44 + arch/arm/cpu/armv7/uniphier/ph1-ld4/sg_init.c | 28 + arch/arm/cpu/armv7/uniphier/ph1-ld4/umc_init.c | 162 +++ arch/arm/cpu/armv7/uniphier/ph1-pro4/Makefile | 10 + arch/arm/cpu/armv7/uniphier/ph1-pro4/board_info.c | 16 + .../armv7/uniphier/ph1-pro4/board_postclk_init.c | 39 + arch/arm/cpu/armv7/uniphier/ph1-pro4/boot-mode.c | 66 ++ arch/arm/cpu/armv7/uniphier/ph1-pro4/clkrst_init.c | 29 + arch/arm/cpu/armv7/uniphier/ph1-pro4/pinctrl.c | 45 + arch/arm/cpu/armv7/uniphier/ph1-pro4/pll_init.c | 168 +++ .../arm/cpu/armv7/uniphier/ph1-pro4/pll_spectrum.c | 18 + arch/arm/cpu/armv7/uniphier/ph1-pro4/sbc_init.c | 75 ++ arch/arm/cpu/armv7/uniphier/ph1-pro4/sg_init.c | 28 + arch/arm/cpu/armv7/uniphier/ph1-pro4/umc_init.c | 136 +++ arch/arm/cpu/armv7/uniphier/ph1-sld8/Makefile | 10 + arch/arm/cpu/armv7/uniphier/ph1-sld8/bcu_init.c | 1 + arch/arm/cpu/armv7/uniphier/ph1-sld8/board_info.c | 16 + .../armv7/uniphier/ph1-sld8/board_postclk_init.c | 1 + arch/arm/cpu/armv7/uniphier/ph1-sld8/boot-mode.c | 1 + arch/arm/cpu/armv7/uniphier/ph1-sld8/clkrst_init.c | 29 + arch/arm/cpu/armv7/uniphier/ph1-sld8/pinctrl.c | 57 ++ arch/arm/cpu/armv7/uniphier/ph1-sld8/pll_init.c | 201 ++++ .../arm/cpu/armv7/uniphier/ph1-sld8/pll_spectrum.c | 1 + arch/arm/cpu/armv7/uniphier/ph1-sld8/sbc_init.c | 51 + arch/arm/cpu/armv7/uniphier/ph1-sld8/sg_init.c | 1 + arch/arm/cpu/armv7/uniphier/ph1-sld8/umc_init.c | 142 +++ arch/arm/cpu/armv7/uniphier/reset.c | 29 + arch/arm/cpu/armv7/uniphier/smp.S | 54 + arch/arm/cpu/armv7/uniphier/spl.c | 17 + arch/arm/cpu/armv7/uniphier/support_card.c | 180 ++++ arch/arm/cpu/armv7/uniphier/timer.c | 39 + arch/arm/include/asm/arch-uniphier/arm-mpcore.h | 46 + arch/arm/include/asm/arch-uniphier/bcu-regs.h | 30 + arch/arm/include/asm/arch-uniphier/board.h | 35 + arch/arm/include/asm/arch-uniphier/boot-device.h | 20 + arch/arm/include/asm/arch-uniphier/led.h | 101 ++ arch/arm/include/asm/arch-uniphier/sbc-regs.h | 108 ++ arch/arm/include/asm/arch-uniphier/sc-regs.h | 62 ++ arch/arm/include/asm/arch-uniphier/sg-regs.h | 182 ++++ arch/arm/include/asm/arch-uniphier/ssc-regs.h | 67 ++ arch/arm/include/asm/arch-uniphier/umc-regs.h | 119 +++ arch/arm/include/asm/arch-vf610/imx-regs.h | 49 +- arch/arm/include/asm/arch-vf610/iomux-vf610.h | 44 +- arch/arm/include/asm/imx-common/iomux-v3.h | 2 + board/freescale/vf610twr/vf610twr.c | 94 +- configs/ph1_ld4_defconfig | 8 + configs/ph1_pro4_defconfig | 8 + configs/ph1_sld8_defconfig | 8 + doc/README.nand | 6 - doc/git-mailrc | 1 + drivers/mtd/Kconfig | 1 + drivers/mtd/nand/Kconfig | 42 + drivers/mtd/nand/Makefile | 1 + drivers/mtd/nand/denali_spl.c | 231 +++++ drivers/serial/Makefile | 1 + drivers/serial/serial.c | 2 + drivers/serial/serial_uniphier.c | 204 ++++ include/configs/lsxl.h | 4 +- include/configs/ph1_ld4.h | 59 ++ include/configs/ph1_pro4.h | 61 ++ include/configs/ph1_sld8.h | 61 ++ include/configs/sheevaplug.h | 46 +- include/configs/uniphier-common.h | 266 +++++ 84 files changed, 5675 insertions(+), 74 deletions(-) create mode 100644 arch/arm/cpu/armv7/uniphier/Kconfig create mode 100644 arch/arm/cpu/armv7/uniphier/Makefile create mode 100644 arch/arm/cpu/armv7/uniphier/board_common.c create mode 100644 arch/arm/cpu/armv7/uniphier/board_late_init.c create mode 100644 arch/arm/cpu/armv7/uniphier/cache_uniphier.c create mode 100644 arch/arm/cpu/armv7/uniphier/cmd_pinmon.c create mode 100644 arch/arm/cpu/armv7/uniphier/cpu_info.c create mode 100644 arch/arm/cpu/armv7/uniphier/dram_init.c create mode 100644 arch/arm/cpu/armv7/uniphier/init_page_table.c create mode 100644 arch/arm/cpu/armv7/uniphier/lowlevel_init.S create mode 100644 arch/arm/cpu/armv7/uniphier/ph1-ld4/Makefile create mode 100644 arch/arm/cpu/armv7/uniphier/ph1-ld4/bcu_init.c create mode 100644 arch/arm/cpu/armv7/uniphier/ph1-ld4/board_info.c create mode 100644 arch/arm/cpu/armv7/uniphier/ph1-ld4/board_postclk_init.c create mode 100644 arch/arm/cpu/armv7/uniphier/ph1-ld4/boot-mode.c create mode 100644 arch/arm/cpu/armv7/uniphier/ph1-ld4/clkrst_init.c create mode 100644 arch/arm/cpu/armv7/uniphier/ph1-ld4/pinctrl.c create mode 100644 arch/arm/cpu/armv7/uniphier/ph1-ld4/pll_init.c create mode 100644 arch/arm/cpu/armv7/uniphier/ph1-ld4/pll_spectrum.c create mode 100644 arch/arm/cpu/armv7/uniphier/ph1-ld4/sbc_init.c create mode 100644 arch/arm/cpu/armv7/uniphier/ph1-ld4/sg_init.c create mode 100644 arch/arm/cpu/armv7/uniphier/ph1-ld4/umc_init.c create mode 100644 arch/arm/cpu/armv7/uniphier/ph1-pro4/Makefile create mode 100644 arch/arm/cpu/armv7/uniphier/ph1-pro4/board_info.c create mode 100644 arch/arm/cpu/armv7/uniphier/ph1-pro4/board_postclk_init.c create mode 100644 arch/arm/cpu/armv7/uniphier/ph1-pro4/boot-mode.c create mode 100644 arch/arm/cpu/armv7/uniphier/ph1-pro4/clkrst_init.c create mode 100644 arch/arm/cpu/armv7/uniphier/ph1-pro4/pinctrl.c create mode 100644 arch/arm/cpu/armv7/uniphier/ph1-pro4/pll_init.c create mode 100644 arch/arm/cpu/armv7/uniphier/ph1-pro4/pll_spectrum.c create mode 100644 arch/arm/cpu/armv7/uniphier/ph1-pro4/sbc_init.c create mode 100644 arch/arm/cpu/armv7/uniphier/ph1-pro4/sg_init.c create mode 100644 arch/arm/cpu/armv7/uniphier/ph1-pro4/umc_init.c create mode 100644 arch/arm/cpu/armv7/uniphier/ph1-sld8/Makefile create mode 100644 arch/arm/cpu/armv7/uniphier/ph1-sld8/bcu_init.c create mode 100644 arch/arm/cpu/armv7/uniphier/ph1-sld8/board_info.c create mode 100644 arch/arm/cpu/armv7/uniphier/ph1-sld8/board_postclk_init.c create mode 100644 arch/arm/cpu/armv7/uniphier/ph1-sld8/boot-mode.c create mode 100644 arch/arm/cpu/armv7/uniphier/ph1-sld8/clkrst_init.c create mode 100644 arch/arm/cpu/armv7/uniphier/ph1-sld8/pinctrl.c create mode 100644 arch/arm/cpu/armv7/uniphier/ph1-sld8/pll_init.c create mode 100644 arch/arm/cpu/armv7/uniphier/ph1-sld8/pll_spectrum.c create mode 100644 arch/arm/cpu/armv7/uniphier/ph1-sld8/sbc_init.c create mode 100644 arch/arm/cpu/armv7/uniphier/ph1-sld8/sg_init.c create mode 100644 arch/arm/cpu/armv7/uniphier/ph1-sld8/umc_init.c create mode 100644 arch/arm/cpu/armv7/uniphier/reset.c create mode 100644 arch/arm/cpu/armv7/uniphier/smp.S create mode 100644 arch/arm/cpu/armv7/uniphier/spl.c create mode 100644 arch/arm/cpu/armv7/uniphier/support_card.c create mode 100644 arch/arm/cpu/armv7/uniphier/timer.c create mode 100644 arch/arm/include/asm/arch-uniphier/arm-mpcore.h create mode 100644 arch/arm/include/asm/arch-uniphier/bcu-regs.h create mode 100644 arch/arm/include/asm/arch-uniphier/board.h create mode 100644 arch/arm/include/asm/arch-uniphier/boot-device.h create mode 100644 arch/arm/include/asm/arch-uniphier/led.h create mode 100644 arch/arm/include/asm/arch-uniphier/sbc-regs.h create mode 100644 arch/arm/include/asm/arch-uniphier/sc-regs.h create mode 100644 arch/arm/include/asm/arch-uniphier/sg-regs.h create mode 100644 arch/arm/include/asm/arch-uniphier/ssc-regs.h create mode 100644 arch/arm/include/asm/arch-uniphier/umc-regs.h create mode 100644 configs/ph1_ld4_defconfig create mode 100644 configs/ph1_pro4_defconfig create mode 100644 configs/ph1_sld8_defconfig create mode 100644 drivers/mtd/nand/Kconfig create mode 100644 drivers/mtd/nand/denali_spl.c create mode 100644 drivers/serial/serial_uniphier.c create mode 100644 include/configs/ph1_ld4.h create mode 100644 include/configs/ph1_pro4.h create mode 100644 include/configs/ph1_sld8.h create mode 100644 include/configs/uniphier-common.h Amicalement, -- Albert.

2 1

[U-Boot] [PATCH 00/32] ARM: i.MX: nitrogen6x clean up
by Eric Nelson 07 Oct '14

07 Oct '14

This collection of patches comprises a set of updates that have been lingering in our Github repository. We're pushing them to main-line in preparation for the addition of a couple of boards that have also been lingering for a while. Patches 1-9 are tweaks to the mx6qsabrelite/nitrogen6x initialization code. Patches 10-18 add support for additional displays supported by the board(s) and tweak the HDMI detection. Patches 19-32 enable and configure various features through changes to include/configs/nitrogen6x.h. Diego Rondini (1): nitrogen6x: config: allow boot to USB stick Eric Nelson (24): nitrogen6x: implement board_cfb_skip() to disable text output nitrogen6x: configure SD2 pads for SDIO on USDHC2 nitrogen6x: power-down miscellanous peripherals nitrogen6x: staticize board file nitrogen6x: Allow U-Boot to be silent on UART2 nitrogen6x: prevent warnings about board_ehci* callbacks nitrogen6x: display: add qvga panel nitrogen6x: display: add support for LG-9.7 LVDS display nitrogen6x: display: add LDB-WXGA-S for SPWG 1280x800 displays nitrogen6x: display: add support for fusion 7 display nitrogen6x: display: add svga display (800x600) nitrogen6x: display: add Ampire 1024x600 panel nitrogen6x: display: add wvga-lvds panel nitrogen6x: display use I2C detect for HDMI nitrogen6x: config: add USB Mass Storage (ums) support nitrogen6x: config: add initrd_high nitrogen6x: config: expose SATA, then MMC over USB nitrogen6x: config: enable USB keyboard support nitrogen6x: config: add CONFIG_CMD_MEMTEST nitrogen6x: config: enable "i2c edid" nitrogen6x: config: disable logo nitrogen6x: config: configure usb_ether nitrogen6x: config: add gpio command nitrogen6x: config: enable Android fastboot Kevin Mihelich (2): nitrogen6x: config: use FS_GENERIC load command nitrogen6x: config: enable EXT4 filesystem Robert Winkler (1): nitrogen6x: display: add support lvds jeida screen Troy Kisky (4): nitrogen6x: simplify board_mmc_getcd nitrogen6x: configure SGTL5000, CSI camera clock outputs nitrogen6x: phy: add 100 us delay after phy reset nitrogen6x: config: allow more bootargs parameters board/boundary/nitrogen6x/nitrogen6x.c | 298 +++++++++++++++++++++++++++++---- include/configs/nitrogen6x.h | 98 +++++++++-- 2 files changed, 347 insertions(+), 49 deletions(-) -- 1.9.1

2 70

[U-Boot] [PATCH] HACK: arndale: deinit scsi before launching Linux
by Ian Campbell 07 Oct '14

07 Oct '14

From: Ian Campbell <ian.campbell(a)citrix.com> NOT TO BE APPLIED AS IS Without this Linux fails to correctly init the phy (or something) and cannot detect the disk. Even with this we can fail to detect the disk outselves on some fraction of boots, so something else is clearly up too. --- arch/arm/cpu/armv7/exynos/sata.c | 11 +++++++++++ arch/arm/lib/bootm.c | 4 ++++ board/samsung/arndale/arndale.c | 5 +++++ drivers/block/ahci.c | 4 ++++ include/scsi.h | 1 + 5 files changed, 25 insertions(+) diff --git a/arch/arm/cpu/armv7/exynos/sata.c b/arch/arm/cpu/armv7/exynos/sata.c index 14d42e7..05f1372 100644 --- a/arch/arm/cpu/armv7/exynos/sata.c +++ b/arch/arm/cpu/armv7/exynos/sata.c @@ -310,6 +310,11 @@ static int exynos5_ahci_init(void __iomem *mmio) printf("%s: already calibrated?\n", __func__); } + /* Clear phy control enable. Seems to be necessary to + * reinitialise on a warm reboot, at least sometimes. */ + clrbits_le32(EXYNOS5_SATA_PHY_CONTROL, S5P_PMU_SATA_PHY_CONTROL_EN); + udelay(1000); + setbits_le32(EXYNOS5_SATA_PHY_CONTROL, S5P_PMU_SATA_PHY_CONTROL_EN); __raw_writel(0, phy_ctrl + SATA_RESET); @@ -368,3 +373,9 @@ int exynos5_sata_init(void) } return -ENODEV; } + +int exynos5_sata_deinit(void) +{ + clrbits_le32(EXYNOS5_SATA_PHY_CONTROL, S5P_PMU_SATA_PHY_CONTROL_EN); + return 0; +} diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index 39fe7a1..9c8d242 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -15,6 +15,7 @@ #include <common.h> #include <command.h> #include <image.h> +#include <scsi.h> #include <u-boot/zlib.h> #include <asm/byteorder.h> #include <libfdt.h> @@ -81,6 +82,9 @@ static void announce_and_cleanup(int fake) #ifdef CONFIG_USB_DEVICE udc_disconnect(); #endif +#ifdef CONFIG_SCSI_AHCI_PLAT + scsi_deinit(); +#endif cleanup_before_linux(); } diff --git a/board/samsung/arndale/arndale.c b/board/samsung/arndale/arndale.c index 551bfce..43c9694 100644 --- a/board/samsung/arndale/arndale.c +++ b/board/samsung/arndale/arndale.c @@ -36,6 +36,11 @@ int scsi_init(void) printf("ARNDALE SCSI INIT\n"); return exynos5_sata_init(); } + +int scsi_deinit(void) +{ + return exynos5_sata_deinit(); +} #endif int board_init(void) diff --git a/drivers/block/ahci.c b/drivers/block/ahci.c index a93a8e1..a7e57be 100644 --- a/drivers/block/ahci.c +++ b/drivers/block/ahci.c @@ -959,6 +959,10 @@ void __weak scsi_init(void) { } +void __weak scsi_deinit(void) +{ +} + #endif /* diff --git a/include/scsi.h b/include/scsi.h index 73de7b7..06ad192 100644 --- a/include/scsi.h +++ b/include/scsi.h @@ -172,6 +172,7 @@ void scsi_low_level_init(int busdevfunc); * functions residing inside cmd_scsi.c */ void scsi_init(void); +void scsi_deinit(void); void scsi_scan(int mode); /** @return the number of scsi disks */ -- 2.1.0

2 2