Enable the CLCD output

This patch is to avoid setting the MUXFPGA configuration in the platform
code in the kernel. On real hardware, this function is handled by the
boot monitor.

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

diff --git a/Makefile b/Makefile
index 32f5022dfcd88e10d4643904597820fc2b63b958..08b6707837235166d9d579835d4b8bfc91ecb22a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,7 @@
 # VE
 PHYS_OFFSET    := 0x80000000
 UART_BASE      := 0x1c090000
+SYSREGS_BASE   := 0x1c010000
 GIC_DIST_BASE  := 0x2c001000
 GIC_CPU_BASE   := 0x2c002000
 CNTFRQ         := 0x01800000   # 24Mhz
@@ -62,7 +63,7 @@ $(IMAGE): boot.o model.lds fdt.dtb $(KERNEL) $(FILESYSTEM)
        $(LD) -o $@ --script=model.lds
 
 boot.o: $(BOOTLOADER) Makefile
-       $(CC) $(CPPFLAGS) -DCNTFRQ=$(CNTFRQ) -DUART_BASE=$(UART_BASE) -DSYS_FLAGS=$(SYS_FLAGS) -DGIC_DIST_BASE=$(GIC_DIST_BASE) -DGIC_CPU_BASE=$(GIC_CPU_BASE) -c -o $@ $(BOOTLOADER)
+       $(CC) $(CPPFLAGS) -DCNTFRQ=$(CNTFRQ) -DUART_BASE=$(UART_BASE) -DSYSREGS_BASE=$(SYSREGS_BASE) -DGIC_DIST_BASE=$(GIC_DIST_BASE) -DGIC_CPU_BASE=$(GIC_CPU_BASE) -c -o $@ $(BOOTLOADER)
 
 model.lds: $(LD_SCRIPT) Makefile
        $(CC) $(CPPFLAGS) -DPHYS_OFFSET=$(PHYS_OFFSET) -DMBOX_OFFSET=$(MBOX_OFFSET) -DKERNEL_OFFSET=$(KERNEL_OFFSET) -DFDT_OFFSET=$(FDT_OFFSET) -DFS_OFFSET=$(FS_OFFSET) -DKERNEL=$(KERNEL) -DFILESYSTEM=$(FILESYSTEM) -E -P -C -o $@ $<

diff --git a/boot.S b/boot.S
index 27367d85d1156573532b85543bd4a4d5304a681d..a1f25e2b5f4108fc41b654e767a5b5ef3209b01e 100644 (file)
--- a/boot.S
+++ b/boot.S
@@ -99,6 +99,14 @@ start_ns:
        orr     w5, w5, #0x0001                 // cr
        str     w5, [x4, #0x30]
 
+       /*
+        * CLCD output site MB
+        */
+       ldr     x4, =SYSREGS_BASE
+       ldr     w5, =(1 << 31) | (1 << 30) | (7 << 20) | (0 << 16)      // START|WRITE|MUXFPGA|SITE_MB
+       str     wzr, [x4, #0xa0]                // V2M_SYS_CFGDATA
+       str     w5, [x4, #0xa4]                 // V2M_SYS_CFGCTRL
+
        /*
         * Primary CPU
         */