diff options
author | Edward Cragg <edward.cragg@codethink.co.uk> | 2015-05-29 17:19:00 +0100 |
---|---|---|
committer | Edward Cragg <edward.cragg@codethink.co.uk> | 2015-09-24 09:28:10 +0100 |
commit | 449a647063a110186bbbbbc21c08c157db92a351 (patch) | |
tree | 39e84aa8e6c4d74d29ff914581159adbbc8e47fc | |
parent | 276affcce2d93072960c353962177b0b30e2b103 (diff) | |
download | bsp-support-449a647063a110186bbbbbc21c08c157db92a351.tar.gz |
SoCFPGA: Add patches
These patches are applied when Baserock builds, modifying the
automatically generated headers and Makefile used to build
the SPL preloader
Change-Id: Idbd1a822337363bf9e6e35bdc5e256182145f6b9
-rw-r--r-- | altera-socfpga/patches/ecc-off.diff | 13 | ||||
-rw-r--r-- | altera-socfpga/patches/no-untar.diff | 34 | ||||
-rw-r--r-- | altera-socfpga/patches/nomkpimage.diff | 13 |
3 files changed, 60 insertions, 0 deletions
diff --git a/altera-socfpga/patches/ecc-off.diff b/altera-socfpga/patches/ecc-off.diff new file mode 100644 index 0000000..d030b75 --- /dev/null +++ b/altera-socfpga/patches/ecc-off.diff @@ -0,0 +1,13 @@ +diff --git a/hardware-handoff/spl_bsp/generated/sdram/sdram_config.h b/hardware-handoff/spl_bsp/generated/sdram/sdram_config.h +index 05d3ce2..5b45c4b 100644 +--- a/hardware-handoff/spl_bsp/generated/sdram/sdram_config.h ++++ b/hardware-handoff/spl_bsp/generated/sdram/sdram_config.h +@@ -33,7 +33,7 @@ + #define CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_MEMTYPE (2) + #define CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_MEMBL (8) + #define CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_ADDRORDER (0) +-#define CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_ECCEN (1) ++#define CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_ECCEN (0) + #define CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_ECCCORREN (1) + #define CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_REORDEREN (1) + #define CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_STARVELIMIT (10) diff --git a/altera-socfpga/patches/no-untar.diff b/altera-socfpga/patches/no-untar.diff new file mode 100644 index 0000000..989741d --- /dev/null +++ b/altera-socfpga/patches/no-untar.diff @@ -0,0 +1,34 @@ +diff --git a/hardware-handoff/spl_bsp/Makefile b/hardware-handoff/spl_bsp/Makefile +index ec12f34..b741a77 100644 +--- a/hardware-handoff/spl_bsp/Makefile ++++ b/hardware-handoff/spl_bsp/Makefile +@@ -72,11 +72,9 @@ define stamp + endef + + define untar_recipe +-$(UNTAR) $(if $1,$1,$(if $<,$<,$(error ERROR: no input provided to gnu make function untar_recipe))) + endef + + # Stamps +-UNTAR_SRC := $(STAMP_DIR)/.untar + CONFIG := $(STAMP_DIR)/.config + PATCH_APPLY := $(STAMP_DIR)/.patch + +@@ -211,7 +209,7 @@ tools: $(CONFIG) + .PHONY: src + src: $(UNTAR_SRC) + +-$(UNTAR_SRC): $(TGZ) ++$(UNTAR_SRC): + @$(RM) $(PRELOADER_SRC_DIR) + $(untar_recipe) + @$(CHMOD) -R 755 $(PRELOADER_SRC_DIR) +@@ -237,7 +235,7 @@ $(UPDATE_GENERATED_SOURCE_FILES): $(PRELOADER_UPDATE_DIR)/%: generated/% $(UNTAR + .PHONY: config + config: $(CONFIG) + +-$(CONFIG): $(UPDATE_SRC) $(UNTAR_SRC) $(PATCH_APPLY) ++$(CONFIG): $(UPDATE_SRC) + $(MAKE) $(MAKE_ARGS) -C $(PRELOADER_SRC_DIR) $(SOCFPGA_BOARD_CONFIG) + $(stamp) + diff --git a/altera-socfpga/patches/nomkpimage.diff b/altera-socfpga/patches/nomkpimage.diff new file mode 100644 index 0000000..d8f208d --- /dev/null +++ b/altera-socfpga/patches/nomkpimage.diff @@ -0,0 +1,13 @@ +diff --git a/hardware-handoff/spl_bsp/Makefile b/hardware-handoff/spl_bsp/Makefile +index ef5a4a0..f558337 100644 +--- a/hardware-handoff/spl_bsp/Makefile ++++ b/hardware-handoff/spl_bsp/Makefile +@@ -173,7 +173,7 @@ PRELOADER.MKPIMAGE_BINARY := preloader-mkpimage.bin + UBOOT.BINARY := $(PRELOADER_SRC_DIR)/u-boot.bin + + .PHONY: all +-all: spl mkpimage-spl ++all: spl + + .PHONY: uboot + uboot: $(UBOOT.BINARY) |