diff options
Diffstat (limited to 'arch/arm/boards/zii-vf610-dev')
| -rw-r--r-- | arch/arm/boards/zii-vf610-dev/flash-header-zii-vf610-dev.imxcfg | 22 | ||||
| -rw-r--r-- | arch/arm/boards/zii-vf610-dev/lowlevel.c | 3 |
2 files changed, 13 insertions, 12 deletions
diff --git a/arch/arm/boards/zii-vf610-dev/flash-header-zii-vf610-dev.imxcfg b/arch/arm/boards/zii-vf610-dev/flash-header-zii-vf610-dev.imxcfg index 177f4e8bdc..bb858907a4 100644 --- a/arch/arm/boards/zii-vf610-dev/flash-header-zii-vf610-dev.imxcfg +++ b/arch/arm/boards/zii-vf610-dev/flash-header-zii-vf610-dev.imxcfg @@ -45,7 +45,7 @@ CHECKPOINT(2) /* * Wait for PLLs to lock */ -check 32 while_any_bit_clear 0x40050030 0x80000000 +check 32 until_any_bit_set 0x40050030 0x80000000 CHECKPOINT(3) @@ -218,26 +218,26 @@ wm 32 0x400ae000 0x00000601 CHECKPOINT(7) -check 32 while_any_bit_clear 0x400ae140 0x100 -# check 32 while_any_bit_clear 0x400ae42c 0x1 -# check 32 while_any_bit_clear 0x400ae46c 0x1 -# check 32 while_any_bit_clear 0x400ae4ac 0x1 +check 32 until_any_bit_set 0x400ae140 0x100 +# check 32 until_any_bit_set 0x400ae42c 0x1 +# check 32 until_any_bit_set 0x400ae46c 0x1 +# check 32 until_any_bit_set 0x400ae4ac 0x1 CHECKPOINT(8) wm 32 0x80000000 0xa5a5a5a5 -check 32 while_any_bit_clear 0x80000000 0xa5a5a5a5 +check 32 until_any_bit_set 0x80000000 0xa5a5a5a5 wm 32 0x400ae000 0x00000600 wm 32 0x400ae000 0x00000601 -check 32 while_any_bit_clear 0x400ae140 0x100 -# check 32 while_any_bit_clear 0x400ae42c 0x1 -# check 32 while_any_bit_clear 0x400ae46c 0x1 -# check 32 while_any_bit_clear 0x400ae4ac 0x1 +check 32 until_any_bit_set 0x400ae140 0x100 +# check 32 until_any_bit_set 0x400ae42c 0x1 +# check 32 until_any_bit_set 0x400ae46c 0x1 +# check 32 until_any_bit_set 0x400ae4ac 0x1 /* wm 32 0x3f040000 0xf0 - check 32 while_any_bit_clear 0x3f040000 0x0f */ + check 32 until_any_bit_set 0x3f040000 0x0f */ CHECKPOINT(9) diff --git a/arch/arm/boards/zii-vf610-dev/lowlevel.c b/arch/arm/boards/zii-vf610-dev/lowlevel.c index 95b68d5dce..f3d67501ab 100644 --- a/arch/arm/boards/zii-vf610-dev/lowlevel.c +++ b/arch/arm/boards/zii-vf610-dev/lowlevel.c @@ -18,6 +18,7 @@ #include <mach/generic.h> #include <asm/barebox-arm-head.h> #include <asm/barebox-arm.h> +#include <mach/esdctl.h> #include <mach/vf610-regs.h> #include <mach/clock-vf610.h> #include <mach/iomux-vf610.h> @@ -133,5 +134,5 @@ ENTRY_FUNCTION(start_zii_vf610_dev, r0, r1, r2) break; } - barebox_arm_entry(0x80000000, SZ_512M, fdt - get_runtime_offset()); + vf610_barebox_entry(fdt + get_runtime_offset()); } |