ARM OMAP boards: switch to barebox_arm_entry
All boards use hardcoded SDRAM addresses, copied from the board init file. OMAP3 boards are a bit special, they had a SoC specific reset() function. This is renamed to omap3_invalidate_dcache() and called from the board lowlevel init code now. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
parent
c984f8cfa0
commit
1c240cd234
|
@ -82,6 +82,8 @@ config ARCH_OMAP
|
||||||
bool "TI OMAP"
|
bool "TI OMAP"
|
||||||
select HAS_DEBUG_LL
|
select HAS_DEBUG_LL
|
||||||
select GPIOLIB
|
select GPIOLIB
|
||||||
|
select MACH_HAS_LOWLEVEL_INIT
|
||||||
|
select MACH_DO_LOWLEVEL_INIT
|
||||||
|
|
||||||
config ARCH_PXA
|
config ARCH_PXA
|
||||||
bool "Intel/Marvell PXA based"
|
bool "Intel/Marvell PXA based"
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
obj-y += board.o
|
obj-y += board.o
|
||||||
obj-$(CONFIG_ARM_BOARD_APPEND_ATAG) += archos_features.o
|
obj-$(CONFIG_ARM_BOARD_APPEND_ATAG) += archos_features.o
|
||||||
obj-$(CONFIG_MACH_DO_LOWLEVEL_INIT) += lowlevel.o mux.o
|
obj-y += lowlevel.o mux.o
|
||||||
pbl-$(CONFIG_MACH_DO_LOWLEVEL_INIT) += lowlevel.o mux.o
|
pbl-y += lowlevel.o mux.o
|
||||||
|
|
|
@ -13,6 +13,7 @@
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
#include <io.h>
|
#include <io.h>
|
||||||
#include <init.h>
|
#include <init.h>
|
||||||
|
#include <sizes.h>
|
||||||
#include <mach/omap4-mux.h>
|
#include <mach/omap4-mux.h>
|
||||||
#include <mach/omap4-silicon.h>
|
#include <mach/omap4-silicon.h>
|
||||||
#include <mach/omap4-clock.h>
|
#include <mach/omap4-clock.h>
|
||||||
|
@ -63,7 +64,7 @@ static noinline void archosg9_init_lowlevel(void)
|
||||||
|
|
||||||
omap4_ddr_init(&ddr_regs_400_mhz_2cs, &core);
|
omap4_ddr_init(&ddr_regs_400_mhz_2cs, &core);
|
||||||
|
|
||||||
board_init_lowlevel_return();
|
barebox_arm_entry(0x80000000, SZ_1G, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
void __naked __bare_init reset(void)
|
void __naked __bare_init reset(void)
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
#include <io.h>
|
#include <io.h>
|
||||||
#include <init.h>
|
#include <sizes.h>
|
||||||
|
#include <asm/barebox-arm-head.h>
|
||||||
|
#include <asm/barebox-arm.h>
|
||||||
#include <mach/control.h>
|
#include <mach/control.h>
|
||||||
#include <mach/omap3-silicon.h>
|
#include <mach/omap3-silicon.h>
|
||||||
#include <mach/omap3-mux.h>
|
#include <mach/omap3-mux.h>
|
||||||
|
@ -164,4 +166,14 @@ static int beagle_board_init(void)
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
pure_initcall(beagle_board_init);
|
|
||||||
|
void __naked reset(void)
|
||||||
|
{
|
||||||
|
omap3_invalidate_dcache();
|
||||||
|
|
||||||
|
common_reset();
|
||||||
|
|
||||||
|
beagle_board_init();
|
||||||
|
|
||||||
|
barebox_arm_entry(0x80000000, SZ_128M, 0);
|
||||||
|
}
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
obj-y += lowlevel.o
|
||||||
|
pbl-y += lowlevel.o
|
||||||
obj-y += board.o
|
obj-y += board.o
|
||||||
obj-y += lowlevel.o
|
obj-y += lowlevel.o
|
||||||
pbl-y += lowlevel.o
|
pbl-y += lowlevel.o
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
#include <init.h>
|
#include <init.h>
|
||||||
#include <sizes.h>
|
#include <sizes.h>
|
||||||
#include <io.h>
|
#include <io.h>
|
||||||
|
#include <asm/barebox-arm-head.h>
|
||||||
|
#include <asm/barebox-arm.h>
|
||||||
#include <mach/am33xx-silicon.h>
|
#include <mach/am33xx-silicon.h>
|
||||||
#include <mach/am33xx-clock.h>
|
#include <mach/am33xx-clock.h>
|
||||||
#include <mach/sdrc.h>
|
#include <mach/sdrc.h>
|
||||||
|
@ -245,4 +247,12 @@ static int beaglebone_board_init(void)
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
pure_initcall(beaglebone_board_init);
|
|
||||||
|
void __naked reset(void)
|
||||||
|
{
|
||||||
|
common_reset();
|
||||||
|
|
||||||
|
beaglebone_board_init();
|
||||||
|
|
||||||
|
barebox_arm_entry(0x80000000, SZ_256M, 0);
|
||||||
|
}
|
||||||
|
|
|
@ -1,7 +1,8 @@
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
#include <io.h>
|
#include <io.h>
|
||||||
#include <init.h>
|
|
||||||
#include <sizes.h>
|
#include <sizes.h>
|
||||||
|
#include <asm/barebox-arm-head.h>
|
||||||
|
#include <asm/barebox-arm.h>
|
||||||
#include <mach/omap3-mux.h>
|
#include <mach/omap3-mux.h>
|
||||||
#include <mach/sdrc.h>
|
#include <mach/sdrc.h>
|
||||||
#include <mach/control.h>
|
#include <mach/control.h>
|
||||||
|
@ -543,4 +544,14 @@ static int sdp343x_board_init(void)
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
pure_initcall(sdp343x_board_init);
|
|
||||||
|
void __naked reset(void)
|
||||||
|
{
|
||||||
|
omap3_invalidate_dcache();
|
||||||
|
|
||||||
|
common_reset();
|
||||||
|
|
||||||
|
sdp343x_board_init();
|
||||||
|
|
||||||
|
barebox_arm_entry(0x80000000, SZ_128M, 0);
|
||||||
|
}
|
||||||
|
|
|
@ -1,7 +1,8 @@
|
||||||
#include <common.h>
|
|
||||||
#include <io.h>
|
#include <io.h>
|
||||||
#include <init.h>
|
#include <init.h>
|
||||||
#include <sizes.h>
|
#include <sizes.h>
|
||||||
|
#include <asm/barebox-arm-head.h>
|
||||||
|
#include <asm/barebox-arm.h>
|
||||||
#include <mach/omap3-mux.h>
|
#include <mach/omap3-mux.h>
|
||||||
#include <mach/sdrc.h>
|
#include <mach/sdrc.h>
|
||||||
#include <mach/control.h>
|
#include <mach/control.h>
|
||||||
|
@ -157,4 +158,12 @@ static int omap3_evm_board_init(void)
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
pure_initcall(omap3_evm_board_init);
|
|
||||||
|
void __naked reset(void)
|
||||||
|
{
|
||||||
|
common_reset();
|
||||||
|
|
||||||
|
omap3_evm_board_init();
|
||||||
|
|
||||||
|
barebox_arm_entry(0x80000000, SZ_128M, 0);
|
||||||
|
}
|
||||||
|
|
|
@ -18,6 +18,7 @@
|
||||||
*/
|
*/
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
#include <io.h>
|
#include <io.h>
|
||||||
|
#include <sizes.h>
|
||||||
#include <mach/omap4-mux.h>
|
#include <mach/omap4-mux.h>
|
||||||
#include <mach/omap4-silicon.h>
|
#include <mach/omap4-silicon.h>
|
||||||
#include <mach/omap4-clock.h>
|
#include <mach/omap4-clock.h>
|
||||||
|
@ -70,8 +71,6 @@ static void noinline panda_init_lowlevel(void)
|
||||||
|
|
||||||
/* Set VCORE1 = 1.3 V, VCORE2 = VCORE3 = 1.21V */
|
/* Set VCORE1 = 1.3 V, VCORE2 = VCORE3 = 1.21V */
|
||||||
omap4_scale_vcores(TPS62361_VSEL0_GPIO);
|
omap4_scale_vcores(TPS62361_VSEL0_GPIO);
|
||||||
|
|
||||||
board_init_lowlevel_return();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void reset(void)
|
void reset(void)
|
||||||
|
@ -79,9 +78,11 @@ void reset(void)
|
||||||
common_reset();
|
common_reset();
|
||||||
|
|
||||||
if (get_pc() > 0x80000000)
|
if (get_pc() > 0x80000000)
|
||||||
board_init_lowlevel_return();
|
goto out;
|
||||||
|
|
||||||
arm_setup_stack(0x4030d000);
|
arm_setup_stack(0x4030d000);
|
||||||
|
|
||||||
panda_init_lowlevel();
|
panda_init_lowlevel();
|
||||||
|
out:
|
||||||
|
barebox_arm_entry(0x80000000, SZ_1G, 0);
|
||||||
}
|
}
|
||||||
|
|
|
@ -18,6 +18,7 @@
|
||||||
*/
|
*/
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
#include <io.h>
|
#include <io.h>
|
||||||
|
#include <sizes.h>
|
||||||
#include <mach/omap4-mux.h>
|
#include <mach/omap4-mux.h>
|
||||||
#include <mach/omap4-silicon.h>
|
#include <mach/omap4-silicon.h>
|
||||||
#include <mach/omap4-clock.h>
|
#include <mach/omap4-clock.h>
|
||||||
|
@ -80,8 +81,6 @@ static void noinline pcm049_init_lowlevel(void)
|
||||||
sr32(0x4A30a31C, 16, 4, 0x0); /* set divisor to 1 */
|
sr32(0x4A30a31C, 16, 4, 0x0); /* set divisor to 1 */
|
||||||
sr32(0x4A30a110, 0, 1, 0x1); /* set the clock source to active */
|
sr32(0x4A30a110, 0, 1, 0x1); /* set the clock source to active */
|
||||||
sr32(0x4A30a110, 2, 2, 0x3); /* enable clocks */
|
sr32(0x4A30a110, 2, 2, 0x3); /* enable clocks */
|
||||||
|
|
||||||
board_init_lowlevel_return();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void reset(void)
|
void reset(void)
|
||||||
|
@ -89,9 +88,11 @@ void reset(void)
|
||||||
common_reset();
|
common_reset();
|
||||||
|
|
||||||
if (get_pc() > 0x80000000)
|
if (get_pc() > 0x80000000)
|
||||||
board_init_lowlevel_return();
|
goto out;
|
||||||
|
|
||||||
arm_setup_stack(0x4030d000);
|
arm_setup_stack(0x4030d000);
|
||||||
|
|
||||||
pcm049_init_lowlevel();
|
pcm049_init_lowlevel();
|
||||||
|
out:
|
||||||
|
barebox_arm_entry(0x80000000, SZ_512M, 0);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1 +1,3 @@
|
||||||
|
obj-y += lowlevel.o
|
||||||
|
pbl-y += lowlevel.o
|
||||||
obj-y += board.o
|
obj-y += board.o
|
||||||
|
|
|
@ -0,0 +1,11 @@
|
||||||
|
#include <common.h>
|
||||||
|
#include <sizes.h>
|
||||||
|
#include <asm/barebox-arm-head.h>
|
||||||
|
#include <asm/barebox-arm.h>
|
||||||
|
|
||||||
|
void __naked reset(void)
|
||||||
|
{
|
||||||
|
common_reset();
|
||||||
|
|
||||||
|
barebox_arm_entry(0x80000000, SZ_512M, 0);
|
||||||
|
}
|
|
@ -1,7 +1,8 @@
|
||||||
#include <common.h>
|
|
||||||
#include <io.h>
|
#include <io.h>
|
||||||
#include <init.h>
|
#include <init.h>
|
||||||
#include <sizes.h>
|
#include <sizes.h>
|
||||||
|
#include <asm/barebox-arm-head.h>
|
||||||
|
#include <asm/barebox-arm.h>
|
||||||
#include <mach/omap3-mux.h>
|
#include <mach/omap3-mux.h>
|
||||||
#include <mach/sdrc.h>
|
#include <mach/sdrc.h>
|
||||||
#include <mach/control.h>
|
#include <mach/control.h>
|
||||||
|
@ -247,5 +248,12 @@ static int pcaal1_board_init(void)
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
pure_initcall(pcaal1_board_init);
|
|
||||||
|
|
||||||
|
void __naked reset(void)
|
||||||
|
{
|
||||||
|
common_reset();
|
||||||
|
|
||||||
|
pcaal1_board_init();
|
||||||
|
|
||||||
|
barebox_arm_entry(0x80000000, SZ_256M, 0);
|
||||||
|
}
|
||||||
|
|
|
@ -18,6 +18,7 @@
|
||||||
*/
|
*/
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
#include <io.h>
|
#include <io.h>
|
||||||
|
#include <sizes.h>
|
||||||
#include <mach/omap4-mux.h>
|
#include <mach/omap4-mux.h>
|
||||||
#include <mach/omap4-silicon.h>
|
#include <mach/omap4-silicon.h>
|
||||||
#include <mach/omap4-clock.h>
|
#include <mach/omap4-clock.h>
|
||||||
|
@ -80,8 +81,6 @@ static noinline void pcaaxl2_init_lowlevel(void)
|
||||||
sr32(0x4A30a31C, 16, 4, 0x0); /* set divisor to 1 */
|
sr32(0x4A30a31C, 16, 4, 0x0); /* set divisor to 1 */
|
||||||
sr32(0x4A30a110, 0, 1, 0x1); /* set the clock source to active */
|
sr32(0x4A30a110, 0, 1, 0x1); /* set the clock source to active */
|
||||||
sr32(0x4A30a110, 2, 2, 0x3); /* enable clocks */
|
sr32(0x4A30a110, 2, 2, 0x3); /* enable clocks */
|
||||||
|
|
||||||
board_init_lowlevel_return();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void reset(void)
|
void reset(void)
|
||||||
|
@ -89,9 +88,11 @@ void reset(void)
|
||||||
common_reset();
|
common_reset();
|
||||||
|
|
||||||
if (get_pc() > 0x80000000)
|
if (get_pc() > 0x80000000)
|
||||||
board_init_lowlevel_return();
|
goto out;
|
||||||
|
|
||||||
arm_setup_stack(0x4030d000);
|
arm_setup_stack(0x4030d000);
|
||||||
|
|
||||||
pcaaxl2_init_lowlevel();
|
pcaaxl2_init_lowlevel();
|
||||||
|
out:
|
||||||
|
barebox_arm_entry(0x80000000, SZ_512M, 0);
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,7 +29,6 @@ config ARCH_OMAP3
|
||||||
bool "OMAP3"
|
bool "OMAP3"
|
||||||
select CPU_V7
|
select CPU_V7
|
||||||
select GENERIC_GPIO
|
select GENERIC_GPIO
|
||||||
select MACH_HAS_LOWLEVEL_INIT
|
|
||||||
select OMAP_CLOCK_SOURCE_S32K
|
select OMAP_CLOCK_SOURCE_S32K
|
||||||
help
|
help
|
||||||
Say Y here if you are using Texas Instrument's OMAP343x based platform
|
Say Y here if you are using Texas Instrument's OMAP343x based platform
|
||||||
|
@ -148,7 +147,6 @@ config MACH_OMAP3EVM
|
||||||
|
|
||||||
config MACH_PANDA
|
config MACH_PANDA
|
||||||
bool "Texas Instrument's Panda Board"
|
bool "Texas Instrument's Panda Board"
|
||||||
select MACH_HAS_LOWLEVEL_INIT
|
|
||||||
select HAVE_DEFAULT_ENVIRONMENT_NEW
|
select HAVE_DEFAULT_ENVIRONMENT_NEW
|
||||||
depends on ARCH_OMAP4
|
depends on ARCH_OMAP4
|
||||||
help
|
help
|
||||||
|
@ -156,7 +154,6 @@ config MACH_PANDA
|
||||||
|
|
||||||
config MACH_ARCHOSG9
|
config MACH_ARCHOSG9
|
||||||
bool "Archos G9 tablets"
|
bool "Archos G9 tablets"
|
||||||
select MACH_HAS_LOWLEVEL_INIT
|
|
||||||
depends on ARCH_OMAP4
|
depends on ARCH_OMAP4
|
||||||
help
|
help
|
||||||
Say Y here if you are using OMAP4-based Archos G9 tablet
|
Say Y here if you are using OMAP4-based Archos G9 tablet
|
||||||
|
@ -164,7 +161,6 @@ config MACH_ARCHOSG9
|
||||||
config MACH_PCM049
|
config MACH_PCM049
|
||||||
bool "Phytec phyCORE pcm049"
|
bool "Phytec phyCORE pcm049"
|
||||||
depends on ARCH_OMAP4
|
depends on ARCH_OMAP4
|
||||||
select MACH_HAS_LOWLEVEL_INIT
|
|
||||||
help
|
help
|
||||||
Say Y here if you are using Phytecs phyCORE pcm049 board
|
Say Y here if you are using Phytecs phyCORE pcm049 board
|
||||||
based on OMAP4
|
based on OMAP4
|
||||||
|
@ -177,7 +173,6 @@ config MACH_PCAAL1
|
||||||
|
|
||||||
config MACH_PCAAXL2
|
config MACH_PCAAXL2
|
||||||
bool "Phytec phyCARD XL2"
|
bool "Phytec phyCARD XL2"
|
||||||
select MACH_HAS_LOWLEVEL_INIT
|
|
||||||
depends on ARCH_OMAP4
|
depends on ARCH_OMAP4
|
||||||
help
|
help
|
||||||
Say Y here if you are using a phyCARD-A-XL1 PCA-A-XL1
|
Say Y here if you are using a phyCARD-A-XL1 PCA-A-XL1
|
||||||
|
|
|
@ -133,6 +133,7 @@
|
||||||
/* If Architecture specific init functions are present */
|
/* If Architecture specific init functions are present */
|
||||||
#ifndef __ASSEMBLY__
|
#ifndef __ASSEMBLY__
|
||||||
void omap3_core_init(void);
|
void omap3_core_init(void);
|
||||||
|
void omap3_invalidate_dcache(void);
|
||||||
#endif /* __ASSEMBLY__ */
|
#endif /* __ASSEMBLY__ */
|
||||||
|
|
||||||
#endif /* __ASM_ARCH_OMAP3_H */
|
#endif /* __ASM_ARCH_OMAP3_H */
|
||||||
|
|
|
@ -33,9 +33,8 @@
|
||||||
#include <mach/clocks.h>
|
#include <mach/clocks.h>
|
||||||
#include <asm/barebox-arm-head.h>
|
#include <asm/barebox-arm-head.h>
|
||||||
|
|
||||||
#ifdef CONFIG_MACH_DO_LOWLEVEL_INIT
|
.section .text.__omap3_invalidate_dcache
|
||||||
.section .text.__reset
|
ENTRY(omap3_invalidate_dcache)
|
||||||
ENTRY(reset)
|
|
||||||
/* Invalidate all Dcaches */
|
/* Invalidate all Dcaches */
|
||||||
#ifndef CONFIG_CPU_V7_DCACHE_SKIP
|
#ifndef CONFIG_CPU_V7_DCACHE_SKIP
|
||||||
/* If Arch specific ROM code SMI handling does not exist */
|
/* If Arch specific ROM code SMI handling does not exist */
|
||||||
|
@ -83,8 +82,6 @@ finished_inval:
|
||||||
mcr p15, 2, r10, c0, c0, 0 /* select current cache level in cssr */
|
mcr p15, 2, r10, c0, c0, 0 /* select current cache level in cssr */
|
||||||
isb
|
isb
|
||||||
#endif /* CONFIG_CPU_V7_DCACHE_SKIP */
|
#endif /* CONFIG_CPU_V7_DCACHE_SKIP */
|
||||||
common_reset r0
|
|
||||||
/* back to arch calling code */
|
/* back to arch calling code */
|
||||||
b board_init_lowlevel_return
|
bx lr
|
||||||
ENDPROC(reset)
|
ENDPROC(omap3_invalidate_dcache)
|
||||||
#endif
|
|
||||||
|
|
Loading…
Reference in New Issue