integrator: enable Vpp and disable flash protection
This enables Vpp and disables the flash protection on the Integrator when starting U-Boot. The integrator/AP has double protection mechanisms: this one and the EBI protection bit (patch earlier), the Integrator/CP has only one line of protection in these registers. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
parent
0a20e534e9
commit
1dc26801a3
|
@ -37,6 +37,7 @@
|
||||||
#include <netdev.h>
|
#include <netdev.h>
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
#include "arm-ebi.h"
|
#include "arm-ebi.h"
|
||||||
|
#include "integrator-sc.h"
|
||||||
|
|
||||||
DECLARE_GLOBAL_DATA_PTR;
|
DECLARE_GLOBAL_DATA_PTR;
|
||||||
|
|
||||||
|
@ -76,7 +77,19 @@ extern void cm_remap(void);
|
||||||
cm_remap(); /* remaps writeable memory to 0x00000000 */
|
cm_remap(); /* remaps writeable memory to 0x00000000 */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef CONFIG_ARCH_CINTEGRATOR
|
||||||
/*
|
/*
|
||||||
|
* Flash protection on the Integrator/CP is in a simple register
|
||||||
|
*/
|
||||||
|
val = readl(CP_FLASHPROG);
|
||||||
|
val |= (CP_FLASHPROG_FLVPPEN | CP_FLASHPROG_FLWREN);
|
||||||
|
writel(val, CP_FLASHPROG);
|
||||||
|
#else
|
||||||
|
/*
|
||||||
|
* The Integrator/AP has some special protection mechanisms
|
||||||
|
* for the external memories, first the External Bus Interface (EBI)
|
||||||
|
* then the system controller (SC).
|
||||||
|
*
|
||||||
* The system comes up with the flash memory non-writable and
|
* The system comes up with the flash memory non-writable and
|
||||||
* configuration locked. If we want U-Boot to be used for flash
|
* configuration locked. If we want U-Boot to be used for flash
|
||||||
* access we cannot have the flash memory locked.
|
* access we cannot have the flash memory locked.
|
||||||
|
@ -88,6 +101,13 @@ extern void cm_remap(void);
|
||||||
writel(val, EBI_BASE + EBI_CSR1_REG);
|
writel(val, EBI_BASE + EBI_CSR1_REG);
|
||||||
writel(0, EBI_BASE + EBI_LOCK_REG);
|
writel(0, EBI_BASE + EBI_LOCK_REG);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Set up the system controller to remove write protection from
|
||||||
|
* the flash memory and enable Vpp
|
||||||
|
*/
|
||||||
|
writel(SC_CTRL_FLASHVPP | SC_CTRL_FLASHWP, SC_CTRLS);
|
||||||
|
#endif
|
||||||
|
|
||||||
icache_enable ();
|
icache_enable ();
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Reference in New Issue