DECLARE_GLOBAL_DATA_PTR;
/* Lowlevel init isn't used on i.MX28, so just have a dummy here */
-inline void lowlevel_init(void) {}
+void lowlevel_init(void) {}
#define BOOT_CAUSE_MASK (RTC_PERSISTENT0_EXTERNAL_RESET | \
RTC_PERSISTENT0_ALARM_WAKE | \
*/
void mx28_fixup_vt(uint32_t start_addr)
{
- /* ldr pc, [pc, #0x18] */
/* Jumptable location is 0x0 */
uint32_t *vt = (uint32_t *)0x20;
uint32_t cr = get_cr();
-<<<<<<< HEAD
- for (i = 0; i < 8; i++) {
- /* cppcheck-suppress nullPointer */
- vt[i] = ldr_pc;
- /* cppcheck-suppress nullPointer */
- vt[i + 8] = start_addr + (4 * i);
- }
-=======
+ /* cppcheck-suppress nullPointer */
memcpy(vt, (void *)start_addr + 0x20, 32);
set_cr(cr & ~CR_V);
->>>>>>> karo-tx-uboot
}
#ifdef CONFIG_ARCH_MISC_INIT
/*
* Initializes on-chip ethernet controllers.
*/
-#if defined(CONFIG_MX28) && defined(CONFIG_CMD_NET)
+#if defined(CONFIG_SOC_MX28) && defined(CONFIG_CMD_NET)
int cpu_eth_init(bd_t *bis)
{
struct mxs_clkctrl_regs *clkctrl_regs =