Undo redundant workarounds

Author: mattia-moffa

Makefile

@@ -25,7 +25,6 @@ DEBUG_UART?=0
 LIBS=
 SIGN_ALG=
 OBJCOPY_FLAGS=
-OBJCOPY_BIN_FLAGS=
 BIG_ENDIAN?=0
 USE_CLANG?=0
 ifeq ($(USE_CLANG),1)
@@ -199,13 +198,6 @@ ifeq ($(USE_GCC_HEADLESS),1)
   OBJCOPY_FLAGS+=--gap-fill $(FILL_BYTE)
 endif
 
-ifeq ($(ARCH),ARM)
-  ifeq ($(USE_CLANG),1)
-    ifneq ($(TZEN),1)
-      OBJCOPY_BIN_FLAGS+=$(CLANG_ARM_OBJCOPY_FLASH_FLAGS_BOOT)
-    endif
-  endif
-endif
 ifeq ($(TARGET),ti_hercules)
   LSCRIPT_FLAGS+=--run_linker $(LSCRIPT)
 endif
@@ -335,21 +327,7 @@ wolfboot.efi: wolfboot.elf
 
 wolfboot.bin: wolfboot.elf
 	@echo "\t[BIN] $@"
-ifeq ($(USE_CLANG),1)
-ifeq ($(TZEN),1)
-	$(Q)last_load="$$($(CROSS_COMPILE)readelf -Wl $< | awk '/ LOAD / { line = $$0 } END { print line }')"; \
-		set -- $$last_load; \
-		last_phys=$$(printf '%d' $$4); \
-		last_filesz=$$(printf '%d' $$5); \
-		padded_filesz=$$((($$last_filesz + 0xff) & ~0xff)); \
-		pad_to=$$((last_phys + padded_filesz)); \
-		$(OBJCOPY) $(OBJCOPY_FLAGS) $(OBJCOPY_BIN_FLAGS) --pad-to=$$(printf '0x%x' $$pad_to) -O binary $< $@
-else
-	$(Q)$(OBJCOPY) $(OBJCOPY_FLAGS) $(OBJCOPY_BIN_FLAGS) -O binary $^ $@
-endif
-else
-	$(Q)$(OBJCOPY) $(OBJCOPY_FLAGS) $(OBJCOPY_BIN_FLAGS) -O binary $^ $@
-endif
+	$(Q)$(OBJCOPY) $(OBJCOPY_FLAGS) -O binary $^ $@
 	@echo
 	@echo "\t[SIZE]"
 	$(Q)$(SIZE) wolfboot.elf

arch.mk

@@ -1301,12 +1301,6 @@ ifeq ($(USE_CLANG),1)
   CFLAGS+=-Wno-unknown-attributes -Wno-error=unknown-attributes
   CFLAGS+=-fno-unwind-tables -fno-asynchronous-unwind-tables
   LSCRIPT_FLAGS+=-T $(abspath $(WOLFBOOT_ROOT)/hal/clang-discard.ld)
-  # Clang-built ARM raw images may otherwise expand ELF loadable gaps into
-  # oversized binaries on some targets. Keep the section selection scoped to
-  # the Clang workaround paths only.
-  CLANG_ARM_OBJCOPY_FLASH_FLAGS_BASE:=-j .text -j .edidx
-  CLANG_ARM_OBJCOPY_FLASH_FLAGS_BOOT:=$(CLANG_ARM_OBJCOPY_FLASH_FLAGS_BASE) -j .ramcode -j .keystore -j .gnu.sgstubs
-  CLANG_ARM_OBJCOPY_FLASH_FLAGS_APP:=$(CLANG_ARM_OBJCOPY_FLASH_FLAGS_BASE)
 endif
 
 ifeq ($(USE_GCC),1)

test-app/Makefile

@@ -105,15 +105,6 @@ OBJCOPY_FLAGS+=--gap-fill $(FILL_BYTE)
 OBJCOPY_IMAGE_FLAGS:=
 
 ifeq ($(USE_CLANG),1)
-  # Clang-built ARM ELFs can keep RAM sections as loadable segments, and raw
-  # objcopy output then expands the flash-to-RAM gap into a huge sparse image.
-  # The app image only needs the flash-backed output sections. TrustZone
-  # non-secure apps also need the flash-backed .data load image.
-  ifeq ($(TZEN),1)
-    OBJCOPY_IMAGE_FLAGS+=-j .text -j .edidx -j .data
-  else
-    OBJCOPY_IMAGE_FLAGS+=$(CLANG_ARM_OBJCOPY_FLASH_FLAGS_APP)
-  endif
   # Clang doesn't emit empty .data/.bss sections in object files (GCC does).
   # GNU ld mishandles AT() for output sections with no matching input sections,
   # setting LMA=VMA instead of the specified flash address.