diff options
| author | Tom Rini <trini@konsulko.com> | 2024-09-24 10:11:59 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-09-24 13:41:21 -0600 |
| commit | 2add54d496ee8e0e99cf5c6e892c22cfc2e115a3 (patch) | |
| tree | 77bf3117d5d0b2f0fb27a5df7a56dac8b21da7cf /arch | |
| parent | 8a5ef6effbccf7eea28aea286cfbf7bb2b23bbd0 (diff) | |
| parent | 1582e438ba099fb6f5831e69a543b07664e0c8d5 (diff) | |
Merge patch series "Miscellaneous fixes"
Jerome Forissier <jerome.forissier@linaro.org> says:
Miscellaneous fixes made when developing the lwIP series [1]. They are
posted separately since they make sense on their own. Subsequent
versions of the lwIP series will contain a squashed version of this one.
[1] http://patchwork.ozlabs.org/project/uboot/list/?series=420712&state=%2A&archive=both
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-at91/include/mach/at91_common.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-at91/spl_at91.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-at91/spl_atmel.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/omap3/emac.c | 1 |
4 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-at91/include/mach/at91_common.h b/arch/arm/mach-at91/include/mach/at91_common.h index 683e539b1b3..8fec346c1e4 100644 --- a/arch/arm/mach-at91/include/mach/at91_common.h +++ b/arch/arm/mach-at91/include/mach/at91_common.h @@ -28,7 +28,7 @@ void at91_pllb_init(u32 pllar); void at91_mck_init(u32 mckr); void at91_mck_init_down(u32 mckr); void at91_pmc_init(void); -void mem_init(void); +void at91_mem_init(void); void at91_phy_reset(void); void at91_sdram_hw_init(void); void at91_mck_init(u32 mckr); diff --git a/arch/arm/mach-at91/spl_at91.c b/arch/arm/mach-at91/spl_at91.c index cde1700a283..0d1233cd109 100644 --- a/arch/arm/mach-at91/spl_at91.c +++ b/arch/arm/mach-at91/spl_at91.c @@ -142,7 +142,7 @@ void board_init_f(ulong dummy) preloader_console_init(); #endif - mem_init(); + at91_mem_init(); at91_spl_board_init(); } diff --git a/arch/arm/mach-at91/spl_atmel.c b/arch/arm/mach-at91/spl_atmel.c index 62a7df8a195..7bfbadf0483 100644 --- a/arch/arm/mach-at91/spl_atmel.c +++ b/arch/arm/mach-at91/spl_atmel.c @@ -134,7 +134,7 @@ void board_init_f(ulong dummy) board_early_init_f(); - mem_init(); + at91_mem_init(); ret = spl_init(); if (ret) { diff --git a/arch/arm/mach-omap2/omap3/emac.c b/arch/arm/mach-omap2/omap3/emac.c index 7348e92cabd..1e30a06361d 100644 --- a/arch/arm/mach-omap2/omap3/emac.c +++ b/arch/arm/mach-omap2/omap3/emac.c @@ -9,6 +9,7 @@ #include <net.h> #include <asm/io.h> #include <asm/arch/am35x_def.h> +#include <netdev.h> /* * Initializes on-chip ethernet controllers. |