.gitignore

@@ -9,6 +9,7 @@ payloads/external/GRUB2/grub2/
 payloads/external/SeaBIOS/seabios/
 payloads/external/sortbootorder/sortbootorder/
 payloads/external/iPXE/ipxe
+payloads/external/Memtest86Plus/memtest86plus
 payloads/libpayload/install/
 util/crossgcc/acpica-unix-*/
 util/crossgcc/binutils-*/

.gitlab-ci.yml

@@ -1,14 +1,13 @@
-image: registry.gitlab.com/pcengines/apu2-documentation:latest
+image: pcengines/pce-fw-builder-legacy:latest
 
 services:
   - docker:dind
-  
+
 variables:
-  RELEASE_DIR: ${CI_PROJECT_DIR}/apu2_fw_rel
+  RELEASE_DIR: ${CI_PROJECT_DIR}
 
 stages:
   - check_dependencies
-  - build_crosscompiler
   - build_rom
   - test_rom
   - sign_rom
@@ -17,53 +16,30 @@ stages:
 check_dependencies:
   stage: check_dependencies
   script:
-    - git ls-remote https://github.com/pcengines/release_manifests.git | grep ${CI_COMMIT_REF_NAME}
-  only:
-    - tags
-
-build_crosscompiler:
-  stage: build_crosscompiler
-  tags: 
-    - docker
-  script:
-    - test -e ${CI_PROJECT_DIR}/apu2_fw_rel/apu2/coreboot/util/crossgcc/xgcc || { make crossgcc-i386 CPUS=$(nproc) &&  mkdir -p ${CI_PROJECT_DIR}/apu2_fw_rel/apu2/coreboot/util/crossgcc/ && mv -f ${CI_PROJECT_DIR}/util/crossgcc/xgcc ${CI_PROJECT_DIR}/apu2_fw_rel/apu2/coreboot/util/crossgcc/ ; }
-  cache:
-    key: apu
-    paths:
-      - ${CI_PROJECT_DIR}/apu2_fw_rel/apu2/coreboot/util/crossgcc/xgcc
+    - git ls-remote https://github.com/pcengines/coreboot.git | grep ${CI_COMMIT_REF_NAME}
   only:
-    - tags
-    - web    
+    - tags 
 
 .build_rom_apu: &build_rom_apu
   variables:
     PLATFORM: apux
-    MANIFEST_FALLBACK_BRANCH: coreboot-xxxx
   stage: build_rom
   tags: 
     - docker
-  dependencies:
-    - build_crosscompiler
   script:
-    - mkdir -p apu2_fw_rel && cd apu2_fw_rel
-    - if [ -n "$CI_COMMIT_TAG" ]; then REPO_REVISION="refs/tags/$CI_COMMIT_REF_NAME"; else REPO_REVISION="$CI_COMMIT_REF_NAME"; fi
-    - git ls-remote https://github.com/pcengines/coreboot.git | grep ${REPO_REVISION} || REPO_REVISION="$MANIFEST_FALLBACK_BRANCH"
-    - repo init -u https://github.com/pcengines/release_manifests.git -b ${REPO_REVISION}
-    - repo sync --force-sync
-    - cp ${CI_PROJECT_DIR}/configs/pcengines_${PLATFORM}.config ${CI_PROJECT_DIR}/apu2_fw_rel/apu2/coreboot/.config
-    - ${RELEASE_DIR}/apu2/apu2-documentation/scripts/build_release_img.sh build
-  cache:
-    policy: pull
-    key: apu
-    paths:
-      - ${RELEASE_DIR}/apu2/coreboot/util/crossgcc/xgcc
+    - git clone https://github.com/pcengines/pce-fw-builder.git /home/coreboot/pce-fw-builder
+    - cd /home/coreboot/pce-fw-builder
+    - git checkout `git describe --tags --abbrev=0`
+    - ./build.sh release-CI "${CI_COMMIT_REF_NAME}" "${PLATFORM}"
+    - cp -v /home/coreboot/release/${PLATFORM}_* ${RELEASE_DIR}
+    - ls -al ${RELEASE_DIR}
   artifacts:
     name: ${PLATFORM}
     paths:
       - ${RELEASE_DIR}/${PLATFORM}_*
   only:
-    - tags
-    - web     
+    - tags   
+    - web
 
 .test_rom: &test_rom
   variables:
@@ -75,7 +51,6 @@ build_crosscompiler:
     - ls -la ${RELEASE_DIR}/${PLATFORM}_*.rom
   only:
     - tags
-    - web
 
 .sign_rom: &sign_rom
   variables:
@@ -100,17 +75,18 @@ build_crosscompiler:
   tags:
     - docker
   script:
+    - ls -al ${RELEASE_DIR}
+    - echo "curl -u ${UPLOADER_USERNAME}:${UPLOADER_PASSWORD} -X MKCOL ${UPLOADER_URL}/${PLATFORM}/; curl -u ${UPLOADER_USERNAME}:${UPLOADER_PASSWORD} -X MKCOL ${UPLOADER_URL}/${PLATFORM}/releases/"
     - curl -u ${UPLOADER_USERNAME}:${UPLOADER_PASSWORD} -X MKCOL "${UPLOADER_URL}/${PLATFORM}/"; curl -u ${UPLOADER_USERNAME}:${UPLOADER_PASSWORD} -X MKCOL "${UPLOADER_URL}/${PLATFORM}/releases/"
+    - echo "for file in ${RELEASE_DIR}/${PLATFORM}_*.tar.gz; do curl --fail -u ${UPLOADER_USERNAME}:${UPLOADER_PASSWORD} -T ${file} ${UPLOADER_URL}/${PLATFORM}/releases/; done"
     - for file in ${RELEASE_DIR}/${PLATFORM}_*.tar.gz; do curl --fail -u ${UPLOADER_USERNAME}:${UPLOADER_PASSWORD} -T ${file} "${UPLOADER_URL}/${PLATFORM}/releases/"; done
   only:
     - tags
-
 
 build:apu2:
   <<: *build_rom_apu
   variables:
     PLATFORM: apu2
-    MANIFEST_FALLBACK_BRANCH: coreboot-4.0.x
 
 .test:apu2:
   <<: *test_rom
@@ -132,7 +108,6 @@ build:apu3:
   <<: *build_rom_apu
   variables:
     PLATFORM: apu3
-    MANIFEST_FALLBACK_BRANCH: coreboot-4.0.x
 
 .test:apu3:
   <<: *test_rom
@@ -154,7 +129,6 @@ build:apu4:
   <<: *build_rom_apu
   variables:
     PLATFORM: apu4
-    MANIFEST_FALLBACK_BRANCH: coreboot-4.0.x
 
 .test:apu4:
   <<: *test_rom
@@ -176,7 +150,6 @@ build:apu5:
   <<: *build_rom_apu
   variables:
     PLATFORM: apu5
-    MANIFEST_FALLBACK_BRANCH: coreboot-4.0.x
 
 .test:apu5:
   <<: *test_rom

CHANGELOG.md

@@ -8,6 +8,15 @@ Releases 4.5.x and 4.6.x are based on mainline support submitted in
 
 ## [Unreleased]
 
+## [v4.0.17] - 2018-05-11
+### Added
+- Infrastructure to include microcode update
+- Support for new building system pce-fw-builder
+
+### Fixed
+- Memtest86+ is now a part of coreboot build system and does not have to be
+built externally
+
 ## [v4.0.16] - 2018-04-06
 ### Added
 - APU4 target
@@ -157,7 +166,8 @@ Releases 4.5.x and 4.6.x are based on mainline support submitted in
 - forced to use SD in 2.0 mode
 - git repository in `Makefile`
 
-[Unreleased]: https://github.com/pcengines/coreboot/compare/v4.0.16...coreboot-4.0.x
+[Unreleased]: https://github.com/pcengines/coreboot/compare/v4.0.17...coreboot-4.0.x
+[v4.0.17]: https://github.com/pcengines/coreboot/compare/v4.0.16...v4.0.17
 [v4.0.16]: https://github.com/pcengines/coreboot/compare/v4.0.15...v4.0.16
 [v4.0.15]: https://github.com/pcengines/coreboot/compare/v4.0.14...v4.0.15
 [v4.0.14]: https://github.com/pcengines/coreboot/compare/v4.0.13...v4.0.14

Makefile

@@ -281,6 +281,6 @@ clean-cscope:
 
 distclean: clean
 	rm -f .config .config.old ..config.tmp .kconfig.d .tmpconfig* .ccwrap .xcompile
-	rm -rf payloads/external/SeaBIOS/seabios payloads/external/iPXE/ipxe payloads/external/sortbootorder/sortbootorder
+	rm -rf payloads/external/SeaBIOS/seabios payloads/external/iPXE/ipxe payloads/external/sortbootorder/sortbootorder payloads/external/Memtest86plus/memtest86plus
 
 .PHONY: $(PHONY) clean clean-for-update clean-cscope cscope distclean doxygen doxy doxygen_simple

Makefile.inc

@@ -41,7 +41,11 @@ endif
 #######################################################################
 # Basic component discovery
 MAINBOARDDIR=$(call strip_quotes,$(CONFIG_MAINBOARD_DIR))
+VARIANT_DIR:=$(call strip_quotes,$(CONFIG_VARIANT_DIR))
+CONFIG_DEVICETREE:=$(call strip_quotes,$(CONFIG_DEVICETREE))
 export MAINBOARDDIR
+export VARIANT_DIR
+
 
 ## Final build results, which CBFSTOOL uses to create the final
 ## rom image file, are placed under $(objcbfs).
@@ -366,13 +370,16 @@ subdirs-y += util/nvidia
 #######################################################################
 # needed objects that every mainboard uses
 # Creation of these is architecture and mainboard independent
-$(obj)/mainboard/$(MAINBOARDDIR)/static.c: $(src)/mainboard/$(MAINBOARDDIR)/devicetree.cb  $(objutil)/sconfig/sconfig
+DEVICETREE_FILE := $(src)/mainboard/$(MAINBOARDDIR)/$(CONFIG_DEVICETREE)
+DEVICETREE_STATIC_C := $(obj)/mainboard/$(MAINBOARDDIR)/static.c
+
+$(DEVICETREE_STATIC_C): $(DEVICETREE_FILE) $(objutil)/sconfig/sconfig
 	@printf "    SCONFIG    $(subst $(src)/,,$(<))\n"
-	mkdir -p $(obj)/mainboard/$(MAINBOARDDIR)
-	$(objutil)/sconfig/sconfig $(MAINBOARDDIR) $(obj)/mainboard/$(MAINBOARDDIR)
+	mkdir -p $(dir $(DEVICETREE_STATIC_C))
+	$(objutil)/sconfig/sconfig $(MAINBOARDDIR)/variants/$(CONFIG_VARIANT_DIR) $(obj)/mainboard/$(MAINBOARDDIR)
 
-ramstage-y+=$(obj)/mainboard/$(MAINBOARDDIR)/static.c
-romstage-y+=$(obj)/mainboard/$(MAINBOARDDIR)/static.c
+ramstage-y+=$(DEVICETREE_STATIC_C)
+romstage-y+=$(DEVICETREE_STATIC_C)
 
 $(objutil)/%.o: $(objutil)/%.c
 	@printf "    HOSTCC     $(subst $(objutil)/,,$(@))\n"
@@ -525,15 +532,22 @@ endif
 ifeq ($(CONFIG_PAYLOAD_SEABIOS),y)
 COREBOOT_ROM_DEPENDENCIES+=seabios
 endif
+ifeq ($(CONFIG_SORTBOOTORDER),y)
+COREBOOT_ROM_DEPENDENCIES+=sortbootorder
+endif
+ifeq ($(CONFIG_MEMTEST),y)
+COREBOOT_ROM_DEPENDENCIES+=memtest
+endif
+ifeq ($(CONFIG_BUILD_IPXE),y)
+COREBOOT_ROM_DEPENDENCIES+=ipxe
+endif
 ifeq ($(CONFIG_PAYLOAD_FILO),y)
 COREBOOT_ROM_DEPENDENCIES+=filo
 endif
 ifeq ($(CONFIG_PAYLOAD_GRUB2),y)
 COREBOOT_ROM_DEPENDENCIES+=grub2
 endif
-ifeq ($(CONFIG_SORTBOOTORDER),y)
-COREBOOT_ROM_DEPENDENCIES+=sortbootorder
-endif
+
 
 extract_nth=$(patsubst -%-,%,$(word $(1), $(subst |,- -,-$(2)-)))
 
@@ -549,16 +563,16 @@ prebuild-files = \
 	       $(if $(call extract_nth,6,$(file)),$(CBFSTOOL) $@.tmp locate -f $(call extract_nth,1,$(file)) -n $(call extract_nth,2,$(file)) -a $(call extract_nth,6,$(file))|xargs -i \
 	       $(cbfs-add-cmd) -b {} &&,\
 	       $(cbfs-add-cmd) $(if $(call extract_nth,5,$(file)),-b $(call extract_nth,5,$(file))) &&))
-prebuilt-files = $(foreach file,$(cbfs-files), $(call extract_nth,1,$(file))) 
+prebuilt-files = $(foreach file,$(cbfs-files), $(call extract_nth,1,$(file)))
 
 prebuild-fixed = \
 	       $(foreach file,$(cbfs-fixed), \
 	       $(CBFSTOOL) $@.tmp \
 	       add$(if $(filter stage,$(call extract_nth,3,$(file))),-stage)$(if $(filter payload,$(call extract_nth,3,$(file))),-payload) \
 	       -f $(call extract_nth,1,$(file)) \
 	       -n $(call extract_nth,2,$(file)) $(if $(filter-out stage,$(call extract_nth,3,$(file))),-t $(call extract_nth,3,$(file))) \
-	       $(if $(call extract_nth,5,$(file)),-b $(call extract_nth,5,$(file))) &&) 
-prebuilt-fixed = $(foreach file,$(cbfs-fixed), $(call extract_nth,1,$(file))) 
+	       $(if $(call extract_nth,5,$(file)),-b $(call extract_nth,5,$(file))) &&)
+prebuilt-fixed = $(foreach file,$(cbfs-fixed), $(call extract_nth,1,$(file)))
 
 
 $(obj)/coreboot.pre1: $(objcbfs)/bootblock.bin $$(prebuilt-files) $$(prebuilt-fixed) $(CBFSTOOL) $$(cpu_ucode_cbfs_file)
@@ -629,12 +643,17 @@ endif
 ifeq ($(CONFIG_HAVE_REFCODE_BLOB),y)
 	$(CBFSTOOL) $@.tmp add-stage -f $(REFCODE_BLOB) -n $(CONFIG_CBFS_PREFIX)/refcode -c $(CBFS_COMPRESS_FLAG)
 endif
-ifeq ($(CONFIG_PXE_ROM),y)
-	$(CBFSTOOL) $@.tmp add -f $(CONFIG_PXE_ROM_FILE) -n pci$(CONFIG_PXE_ROM_ID).rom -t raw
-endif
 ifeq ($(CONFIG_SORTBOOTORDER),y)
-	$(CBFSTOOL) $@.tmp add-payload -f payloads/external/sortbootorder/sortbootorder/sortbootorder.elf -n img/setup -c $(CBFS_PAYLOAD_COMPRESS_FLAG)
+	$(CBFSTOOL) $@.tmp add-payload -f payloads/external/sortbootorder/sortbootorder/sortbootorder.elf -n img/setup
 endif
+ifeq ($(CONFIG_MEMTEST),y)
+	$(CBFSTOOL) $@.tmp add-payload -f payloads/external/Memtest86Plus/memtest86plus/memtest -n img/memtest
+endif
+
+ifeq ($(CONFIG_PXE_ROM)$(CONFIG_BUILD_IPXE),y)
+	$(CBFSTOOL) $@.tmp add -f $(PXE_ROM_FILE) -n genroms/pxe.rom -t raw
+endif
+
 ifeq ($(CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE),y)
 ifeq ($(CONFIG_CPU_MICROCODE_ADDED_DURING_BUILD),y)
 	@printf "    UPDATE-FIT \n"

configs/pcengines_apu2.config

@@ -34,6 +34,8 @@ CONFIG_BOARD_PCENGINES_APU2=y
 # CONFIG_BOARD_PCENGINES_APU4 is not set
 # CONFIG_BOARD_PCENGINES_APU5 is not set
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
+CONFIG_VARIANT_DIR="apu2"
+CONFIG_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
 CONFIG_MAINBOARD_DIR="pcengines/apu2"
 CONFIG_MAINBOARD_PART_NUMBER="apu2"
 # CONFIG_SVI2_SLOW_SPEED is not set
@@ -428,8 +430,11 @@ CONFIG_BUILD_IPXE=y
 CONFIG_IPXE_MASTER=y
 # CONFIG_PXE_SERIAL_CONSOLE is not set
 CONFIG_PXE_ROM_ID="8086,157b"
-CONFIG_PXE_CUSTOM_GENERAL_H="../../../../apu2-documentation/ipxe/general.h"
-CONFIG_PXE_CUSTOM_BOOTMENU_FILE="../../../../apu2-documentation/ipxe/menu.ipxe"
+CONFIG_PXE_CUSTOM_GENERAL_H="general.h"
+CONFIG_PXE_CUSTOM_BOOTMENU_FILE="menu.ipxe"
+CONFIG_MEMTEST=y
+CONFIG_MEMTEST_STABLE=y
+# CONFIG_MEMTEST_MASTER is not set
 
 #
 # Debugging

configs/pcengines_apu3.config

@@ -34,7 +34,9 @@ CONFIG_BOARD_PCENGINES_APU3=y
 # CONFIG_BOARD_PCENGINES_APU4 is not set
 # CONFIG_BOARD_PCENGINES_APU5 is not set
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
-CONFIG_MAINBOARD_DIR="pcengines/apu3"
+CONFIG_VARIANT_DIR="apu3"
+CONFIG_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
+CONFIG_MAINBOARD_DIR="pcengines/apu2"
 CONFIG_MAINBOARD_PART_NUMBER="apu3"
 # CONFIG_SVI2_SLOW_SPEED is not set
 CONFIG_SVI_WAIT_COMP_DIS=y
@@ -428,8 +430,11 @@ CONFIG_BUILD_IPXE=y
 CONFIG_IPXE_MASTER=y
 # CONFIG_PXE_SERIAL_CONSOLE is not set
 CONFIG_PXE_ROM_ID="8086,1539"
-CONFIG_PXE_CUSTOM_GENERAL_H="../../../../apu2-documentation/ipxe/general.h"
-CONFIG_PXE_CUSTOM_BOOTMENU_FILE="../../../../apu2-documentation/ipxe/menu.ipxe"
+CONFIG_PXE_CUSTOM_GENERAL_H="general.h"
+CONFIG_PXE_CUSTOM_BOOTMENU_FILE="menu.ipxe"
+CONFIG_MEMTEST=y
+CONFIG_MEMTEST_STABLE=y
+# CONFIG_MEMTEST_MASTER is not set
 
 #
 # Debugging

configs/pcengines_apu4.config

@@ -34,7 +34,9 @@ CONFIG_VENDOR_PCENGINES=y
 CONFIG_BOARD_PCENGINES_APU4=y
 # CONFIG_BOARD_PCENGINES_APU5 is not set
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
-CONFIG_MAINBOARD_DIR="pcengines/apu4"
+CONFIG_VARIANT_DIR="apu4"
+CONFIG_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
+CONFIG_MAINBOARD_DIR="pcengines/apu2"
 CONFIG_MAINBOARD_PART_NUMBER="apu4"
 # CONFIG_SVI2_SLOW_SPEED is not set
 CONFIG_SVI_WAIT_COMP_DIS=y
@@ -428,8 +430,11 @@ CONFIG_BUILD_IPXE=y
 CONFIG_IPXE_MASTER=y
 # CONFIG_PXE_SERIAL_CONSOLE is not set
 CONFIG_PXE_ROM_ID="8086,1539"
-CONFIG_PXE_CUSTOM_GENERAL_H="../../../../apu2-documentation/ipxe/general.h"
-CONFIG_PXE_CUSTOM_BOOTMENU_FILE="../../../../apu2-documentation/ipxe/menu.ipxe"
+CONFIG_PXE_CUSTOM_GENERAL_H="general.h"
+CONFIG_PXE_CUSTOM_BOOTMENU_FILE="menu.ipxe"
+CONFIG_MEMTEST=y
+CONFIG_MEMTEST_STABLE=y
+# CONFIG_MEMTEST_MASTER is not set
 
 #
 # Debugging

configs/pcengines_apu5.config

@@ -34,7 +34,9 @@ CONFIG_VENDOR_PCENGINES=y
 # CONFIG_BOARD_PCENGINES_APU4 is not set
 CONFIG_BOARD_PCENGINES_APU5=y
 CONFIG_BOARD_SPECIFIC_OPTIONS=y
-CONFIG_MAINBOARD_DIR="pcengines/apu5"
+CONFIG_VARIANT_DIR="apu5"
+CONFIG_DEVICETREE="variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
+CONFIG_MAINBOARD_DIR="pcengines/apu2"
 CONFIG_MAINBOARD_PART_NUMBER="apu5"
 # CONFIG_SVI2_SLOW_SPEED is not set
 CONFIG_SVI_WAIT_COMP_DIS=y
@@ -428,8 +430,11 @@ CONFIG_BUILD_IPXE=y
 CONFIG_IPXE_MASTER=y
 # CONFIG_PXE_SERIAL_CONSOLE is not set
 CONFIG_PXE_ROM_ID="8086,1539"
-CONFIG_PXE_CUSTOM_GENERAL_H="../../../../apu2-documentation/ipxe/general.h"
-CONFIG_PXE_CUSTOM_BOOTMENU_FILE="../../../../apu2-documentation/ipxe/menu.ipxe"
+CONFIG_PXE_CUSTOM_GENERAL_H="general.h"
+CONFIG_PXE_CUSTOM_BOOTMENU_FILE="menu.ipxe"
+CONFIG_MEMTEST=y
+CONFIG_MEMTEST_STABLE=y
+# CONFIG_MEMTEST_MASTER is not set
 
 #
 # Debugging