Cleanups

Author: dgarske

arch.mk

@@ -1001,7 +1001,11 @@ ifeq ($(TARGET),nxp_t2080)
   LDFLAGS+=$(ARCH_FLAGS)
   LDFLAGS+=-Wl,--hash-style=both # generate both sysv and gnu symbol hash table
   LDFLAGS+=-Wl,--as-needed # remove weak functions not used
-  CFLAGS+=-DTEST_FLASH # enable flash erase/write/read test
+  # Flash erase/write/read test at WOLFBOOT_PARTITION_UPDATE_ADDRESS.
+  # Enable with: TEST_FLASH=1 or CFLAGS_EXTRA+=-DTEST_FLASH
+  ifeq ($(TEST_FLASH),1)
+    CFLAGS+=-DTEST_FLASH
+  endif
   OBJS+=src/boot_ppc_mp.o # support for spin table
   UPDATE_OBJS:=src/update_ram.o
   OBJS+=src/fdt.o

config/examples/nxp-t2080.config

@@ -56,5 +56,5 @@ WOLFBOOT_DTS_UPDATE_ADDRESS?=0xE8050000
 # DTS Load to RAM Address
 WOLFBOOT_LOAD_DTS_ADDRESS?=0x200000
 
-# Optional QSPI flash test (erase/write/read on update partition)
-#CFLAGS_EXTRA+=-DTEST_FLASH
+# Flash erase/write/read test at update partition address
+#TEST_FLASH?=1

hal/nxp_ppc.h

@@ -710,10 +710,19 @@ static inline void set32(volatile unsigned int *addr, unsigned int val)
     );
 }
 
+/* longcall attribute for functions in .ramcode — callers in .text need
+ * indirect calls since .ramcode VMA is ~143MB from .text VMA,
+ * exceeding PPC bl +/-32MB range */
+#if defined(__WOLFBOOT) && defined(RAM_CODE) && defined(ARCH_PPC)
+#define LONGCALL_ATTR __attribute__((longcall))
+#else
+#define LONGCALL_ATTR
+#endif
+
 /* C version in boot_ppc.c */
-extern void set_tlb(uint8_t tlb, uint8_t esel, uint32_t epn, uint32_t rpn,
-    uint32_t urpn, uint8_t perms, uint8_t wimge, uint8_t ts, uint8_t tsize,
-    uint8_t iprot);
+extern void LONGCALL_ATTR set_tlb(uint8_t tlb, uint8_t esel, uint32_t epn,
+    uint32_t rpn, uint32_t urpn, uint8_t perms, uint8_t wimge, uint8_t ts,
+    uint8_t tsize, uint8_t iprot);
 extern void disable_tlb1(uint8_t esel);
 extern void flush_cache(uint32_t start_addr, uint32_t size);
 extern void set_law(uint8_t idx, uint32_t addr_h, uint32_t addr_l,
@@ -723,12 +732,12 @@ extern void set_law(uint8_t idx, uint32_t addr_h, uint32_t addr_l,
 extern void uart_init(void);
 
 /* from boot_ppc_start.S */
-extern unsigned long long get_ticks(void);
-extern void wait_ticks(unsigned long long);
+extern unsigned long long LONGCALL_ATTR get_ticks(void);
+extern void LONGCALL_ATTR wait_ticks(unsigned long long);
 extern unsigned long get_pc(void);
 extern void relocate_code(uint32_t *dest, uint32_t *src, uint32_t length);
-extern void invalidate_dcache(void);
-extern void invalidate_icache(void);
+extern void LONGCALL_ATTR invalidate_dcache(void);
+extern void LONGCALL_ATTR invalidate_icache(void);
 extern void icache_enable(void);
 extern void dcache_enable(void);
 extern void dcache_disable(void);