diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-03-11 10:49:50 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-03-11 10:49:50 +0100 |
| commit | 034d4ddcb6dfc7f72cb5076807e93a7bb7e4636b (patch) | |
| tree | a8912608d1b8f1614e58c94f67e0b9f1801018e6 /arch | |
| parent | 7991fe1b8eb057c6d7acc5c91f10108c1ee10a52 (diff) | |
| parent | 092479d7da288479eb99362b4e852948b1de6de9 (diff) | |
| download | barebox-034d4ddcb6dfc7f72cb5076807e93a7bb7e4636b.tar.gz barebox-034d4ddcb6dfc7f72cb5076807e93a7bb7e4636b.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boards/edb93xx/edb93xx.c | 8 | ||||
| -rw-r--r-- | arch/arm/configs/am335x_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-imx/Kconfig | 4 | ||||
| -rw-r--r-- | arch/arm/mach-imx/imx-bbu-internal.c | 3 |
4 files changed, 13 insertions, 3 deletions
diff --git a/arch/arm/boards/edb93xx/edb93xx.c b/arch/arm/boards/edb93xx/edb93xx.c index c314320d21..0fb93d23dc 100644 --- a/arch/arm/boards/edb93xx/edb93xx.c +++ b/arch/arm/boards/edb93xx/edb93xx.c @@ -27,10 +27,16 @@ #include <malloc.h> #include <generated/mach-types.h> #include <mach/ep93xx-regs.h> +#include <net/ep93xx_eth.h> #include "edb93xx.h" #define DEVCFG_U1EN (1 << 18) +static struct ep93xx_eth_platform_data ep93xx_eth_info = { + .xcv_type = PHY_INTERFACE_MODE_MII, + .phy_addr = 1, +}; + static int ep93xx_mem_init(void) { arm_add_mem_device("ram0", CONFIG_EP93XX_SDRAM_BANK0_BASE, @@ -70,7 +76,7 @@ static int ep93xx_devices_init(void) * CS line 6, data width is 16 bit */ add_generic_device("ep93xx_eth", DEVICE_ID_DYNAMIC, NULL, 0, 0, IORESOURCE_MEM, - NULL); + &ep93xx_eth_info); armlinux_set_architecture(MACH_TYPE); diff --git a/arch/arm/configs/am335x_defconfig b/arch/arm/configs/am335x_defconfig index 7cf48b841a..9196fb8b36 100644 --- a/arch/arm/configs/am335x_defconfig +++ b/arch/arm/configs/am335x_defconfig @@ -84,6 +84,7 @@ CONFIG_CMD_BAREBOX_UPDATE=y CONFIG_CMD_OF_NODE=y CONFIG_CMD_OF_PROPERTY=y CONFIG_CMD_OF_DISPLAY_TIMINGS=y +CONFIG_CMD_OF_FIXUP_STATUS=y CONFIG_CMD_OFTREE=y CONFIG_CMD_TIME=y CONFIG_NET=y diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index c631c33cf3..33ae145193 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -698,8 +698,8 @@ config IMX_OCOTP_WRITE MAC to 12:34:56:78:9A:BC (2 words with address 0x22 (OCOTP_MAC0) and address 0x23 (OCOTP_MAC1)). To calculate the file offset multiply the value of the address by 4. - mw -l -d /dev/imx-ocotp 0x8C 0x00001234 - mw -l -d /dev/imx-ocotp 0x88 0x56789ABC + mw -l -d /dev/imx-ocotp 0x8C 0x00001234 + mw -l -d /dev/imx-ocotp 0x88 0x56789ABC config HAB bool diff --git a/arch/arm/mach-imx/imx-bbu-internal.c b/arch/arm/mach-imx/imx-bbu-internal.c index ac90c53bb7..821ce660f5 100644 --- a/arch/arm/mach-imx/imx-bbu-internal.c +++ b/arch/arm/mach-imx/imx-bbu-internal.c @@ -132,6 +132,9 @@ static int imx_bbu_check_prereq(struct bbu_data *data) if (ret) return ret; + if (!strncmp(data->devicefile, "/dev/", 5)) + device_detect_by_name(data->devicefile + 5); + return 0; } |