Merge pull request #255 from pcengines/rel_4.0.23

Rel 4.0.23

.gitlab-ci.yml

@@ -16,33 +16,34 @@ check_dependencies:
   script:
     - git ls-remote https://github.com/pcengines/coreboot.git | grep ${CI_COMMIT_REF_NAME}
   only:
-    - tags 
-      
+    - tags
+
 .build_rom_apu: &build_rom_apu
   image: pcengines/pce-fw-builder-legacy:latest
   variables:
     PLATFORM: apux
   stage: build_rom
-  tags: 
+  tags:
     - docker
   script:
     - 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}
+    - cp -v /home/coreboot/release/${PLATFORM}_${CI_COMMIT_REF_NAME}.rom ${RELEASE_DIR}
     - ls -al ${RELEASE_DIR}
+    - sha256sum ${RELEASE_DIR}/${PLATFORM}_${CI_COMMIT_REF_NAME}.rom
   artifacts:
     name: ${PLATFORM}
     paths:
-      - ${RELEASE_DIR}/${PLATFORM}_*
+      - ${RELEASE_DIR}/${PLATFORM}_${CI_COMMIT_REF_NAME}.rom
   only:
-    - tags   
+    - tags
     - web
-      
+
 .test_rom: &test_rom
   variables:
-    PLATFORM: 
+    PLATFORM:
   stage: test_rom
   tags:
     - docker
@@ -53,7 +54,7 @@ check_dependencies:
 
 .sign_rom: &sign_rom
   variables:
-    PLATFORM: 
+    PLATFORM:
   stage: sign_rom
   tags:
     - docker
@@ -63,22 +64,22 @@ check_dependencies:
   artifacts:
     name: ${PLATFORM}
     paths:
-      - ${RELEASE_DIR}/${PLATFORM}_* 
+      - ${RELEASE_DIR}/${PLATFORM}_*
   only:
     - tags
 
 .publish_rom: &publish_rom
   variables:
-    PLATFORM: 
+    PLATFORM:
   stage: publish_rom
   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
+    - echo "for file in ${RELEASE_DIR}/${PLATFORM}_*.rom; do curl --fail -u ${UPLOADER_USERNAME}:${UPLOADER_PASSWORD} -T ${file} ${UPLOADER_URL}/${PLATFORM}/releases/; done"
+    - for file in ${RELEASE_DIR}/${PLATFORM}_*.rom; do curl --fail -u ${UPLOADER_USERNAME}:${UPLOADER_PASSWORD} -T ${file} "${UPLOADER_URL}/${PLATFORM}/releases/"; done
   only:
     - tags
 
@@ -91,18 +92,18 @@ build:apu2:
   <<: *test_rom
   variables:
     PLATFORM: apu2
-    
+
 .sign:apu2:
   <<: *sign_rom
   variables:
     PLATFORM: apu2
-    
+
 publish:apu2:
   <<: *publish_rom
   variables:
-    PLATFORM: apu2    
-    
-    
+    PLATFORM: apu2
+
+
 build:apu3:
   <<: *build_rom_apu
   variables:
@@ -112,18 +113,18 @@ build:apu3:
   <<: *test_rom
   variables:
     PLATFORM: apu3
-    
+
 .sign:apu3:
   <<: *sign_rom
   variables:
     PLATFORM: apu3
-    
+
 publish:apu3:
   <<: *publish_rom
   variables:
     PLATFORM: apu3
 
-   
+
 build:apu4:
   <<: *build_rom_apu
   variables:
@@ -133,18 +134,18 @@ build:apu4:
   <<: *test_rom
   variables:
     PLATFORM: apu4
-    
+
 .sign:apu4:
   <<: *sign_rom
   variables:
     PLATFORM: apu4
-    
+
 publish:apu4:
   <<: *publish_rom
   variables:
-    PLATFORM: apu4 
+    PLATFORM: apu4
+
 
-
 build:apu5:
   <<: *build_rom_apu
   variables:
@@ -154,13 +155,13 @@ build:apu5:
   <<: *test_rom
   variables:
     PLATFORM: apu5
-    
+
 .sign:apu5:
   <<: *sign_rom
   variables:
     PLATFORM: apu5
-    
+
 publish:apu5:
   <<: *publish_rom
   variables:
-    PLATFORM: apu5    
+    PLATFORM: apu5

CHANGELOG.md

@@ -7,6 +7,15 @@ Releases 4.5.x and 4.6.x are based on mainline support submitted in
 [this gerrit ref](https://review.coreboot.org/#/c/14138/).
 
 ## [Unreleased]
+## [v4.0.23] - 2019-01-09
+## Fixed
+- enabled ECC
+- disabled EHCI0 controller on apu2 which caused problems with pfSense booting
+
+## Changed
+- updated SeaBIOS to rel-1.12.0.1
+- introduced reproducible builds by providing build ID to iPXE
+
 ## [v4.0.22] - 2018-12-03
 ### Changed
 - Updated SeaBIOS to rel-1.11.0.7
@@ -205,7 +214,8 @@ built externally
 - forced to use SD in 2.0 mode
 - git repository in `Makefile`
 
-[Unreleased]: https://github.com/pcengines/coreboot/compare/v4.0.22...coreboot-4.0.x
+[Unreleased]: https://github.com/pcengines/coreboot/compare/v4.0.23...coreboot-4.0.x
+[v4.0.23]: https://github.com/pcengines/coreboot/compare/v4.0.22...v4.0.23
 [v4.0.22]: https://github.com/pcengines/coreboot/compare/v4.0.21...v4.0.22
 [v4.0.21]: https://github.com/pcengines/coreboot/compare/v4.0.20...v4.0.21
 [v4.0.20]: https://github.com/pcengines/coreboot/compare/v4.0.19...v4.0.20

configs/pcengines_apu2.config

@@ -414,7 +414,7 @@ CONFIG_SEABIOS_PCENGINES=y
 # CONFIG_SEABIOS_STABLE is not set
 # CONFIG_SEABIOS_MASTER is not set
 CONFIG_SEABIOS_REVISION=y
-CONFIG_SEABIOS_REVISION_ID="rel-1.11.0.7"
+CONFIG_SEABIOS_REVISION_ID="rel-1.12.0.1"
 CONFIG_SEABIOS_ADD_SERCON_PORT_FILE=y
 CONFIG_SEABIOS_SERCON_PORT_ADDR=0x3f8
 # CONFIG_SEABIOS_THREAD_OPTIONROMS is not set
@@ -440,6 +440,7 @@ CONFIG_IPXE_MASTER=y
 CONFIG_PXE_ROM_ID="8086,157b"
 CONFIG_PXE_CUSTOM_GENERAL_H="general.h"
 CONFIG_PXE_CUSTOM_BOOTMENU_FILE="menu.ipxe"
+CONFIG_PXE_CUSTOM_BUILD_ID="12345678"
 CONFIG_MEMTEST=y
 CONFIG_MEMTEST_STABLE=y
 # CONFIG_MEMTEST_MASTER is not set

configs/pcengines_apu3.config

@@ -414,7 +414,7 @@ CONFIG_SEABIOS_PCENGINES=y
 # CONFIG_SEABIOS_STABLE is not set
 # CONFIG_SEABIOS_MASTER is not set
 CONFIG_SEABIOS_REVISION=y
-CONFIG_SEABIOS_REVISION_ID="rel-1.11.0.7"
+CONFIG_SEABIOS_REVISION_ID="rel-1.12.0.1"
 CONFIG_SEABIOS_ADD_SERCON_PORT_FILE=y
 CONFIG_SEABIOS_SERCON_PORT_ADDR=0x3f8
 # CONFIG_SEABIOS_THREAD_OPTIONROMS is not set
@@ -440,6 +440,7 @@ CONFIG_IPXE_MASTER=y
 CONFIG_PXE_ROM_ID="8086,1539"
 CONFIG_PXE_CUSTOM_GENERAL_H="general.h"
 CONFIG_PXE_CUSTOM_BOOTMENU_FILE="menu.ipxe"
+CONFIG_PXE_CUSTOM_BUILD_ID="12345678"
 CONFIG_MEMTEST=y
 CONFIG_MEMTEST_STABLE=y
 # CONFIG_MEMTEST_MASTER is not set

configs/pcengines_apu4.config

@@ -414,7 +414,7 @@ CONFIG_SEABIOS_PCENGINES=y
 # CONFIG_SEABIOS_STABLE is not set
 # CONFIG_SEABIOS_MASTER is not set
 CONFIG_SEABIOS_REVISION=y
-CONFIG_SEABIOS_REVISION_ID="rel-1.11.0.7"
+CONFIG_SEABIOS_REVISION_ID="rel-1.12.0.1"
 CONFIG_SEABIOS_ADD_SERCON_PORT_FILE=y
 CONFIG_SEABIOS_SERCON_PORT_ADDR=0x3f8
 # CONFIG_SEABIOS_THREAD_OPTIONROMS is not set
@@ -440,6 +440,7 @@ CONFIG_IPXE_MASTER=y
 CONFIG_PXE_ROM_ID="8086,1539"
 CONFIG_PXE_CUSTOM_GENERAL_H="general.h"
 CONFIG_PXE_CUSTOM_BOOTMENU_FILE="menu.ipxe"
+CONFIG_PXE_CUSTOM_BUILD_ID="12345678"
 CONFIG_MEMTEST=y
 CONFIG_MEMTEST_STABLE=y
 # CONFIG_MEMTEST_MASTER is not set

configs/pcengines_apu5.config

@@ -414,7 +414,7 @@ CONFIG_SEABIOS_PCENGINES=y
 # CONFIG_SEABIOS_STABLE is not set
 # CONFIG_SEABIOS_MASTER is not set
 CONFIG_SEABIOS_REVISION=y
-CONFIG_SEABIOS_REVISION_ID="rel-1.11.0.7"
+CONFIG_SEABIOS_REVISION_ID="rel-1.12.0.1"
 CONFIG_SEABIOS_ADD_SERCON_PORT_FILE=y
 CONFIG_SEABIOS_SERCON_PORT_ADDR=0x3f8
 # CONFIG_SEABIOS_THREAD_OPTIONROMS is not set
@@ -440,6 +440,7 @@ CONFIG_IPXE_MASTER=y
 CONFIG_PXE_ROM_ID="8086,1539"
 CONFIG_PXE_CUSTOM_GENERAL_H="general.h"
 CONFIG_PXE_CUSTOM_BOOTMENU_FILE="menu.ipxe"
+CONFIG_PXE_CUSTOM_BUILD_ID="12345678"
 CONFIG_MEMTEST=y
 CONFIG_MEMTEST_STABLE=y
 # CONFIG_MEMTEST_MASTER is not set

payloads/external/iPXE/Kconfig

@@ -99,5 +99,12 @@ config PXE_CUSTOM_BOOTMENU_FILE
 	help
 	  This option allows user to customize boot menu for iPXE ROM.
 
+config PXE_CUSTOM_BUILD_ID
+	string "iPXE custom build_id variable"
+	default ""
+	help
+	  This option allows user to customize build_id for reproducible builds.
+	  It is 32-bit hexadecimal number without "0x" prefix.
+
 endmenu
 endif

payloads/external/iPXE/Makefile.inc

@@ -14,6 +14,13 @@ unexport KCONFIG_SPLITCONFIG
 unexport KCONFIG_TRISTATE
 unexport KCONFIG_NEGATIVES
 
+ifneq ($(CONFIG_PXE_CUSTOM_BUILD_ID),)
+PXE_MAKE_OPTS := BUILD_ID_CMD="echo 0x$(CONFIG_PXE_CUSTOM_BUILD_ID)"
+endif
+ifneq ($(CONFIG_PXE_CUSTOM_BOOTMENU_FILE),)
+PXE_MAKE_OPTS += EMBED=./menu.ipxe
+endif
+
 all: build
 
 $(project_dir):
@@ -63,11 +70,7 @@ endif
 
 build: config
 	echo "    MAKE       $(project_name) $(TAG-y)"
-ifneq ($(CONFIG_PXE_CUSTOM_BOOTMENU_FILE),)
-	$(MAKE) -C $(project_dir)/src bin/$(PXE_ROM_PCI_ID).rom EMBED=./menu.ipxe
-else
-	$(MAKE) -C $(project_dir)/src bin/$(PXE_ROM_PCI_ID).rom
-endif
+	$(MAKE) -C $(project_dir)/src bin/$(PXE_ROM_PCI_ID).rom $(PXE_MAKE_OPTS)
 	cp $(project_dir)/src/bin/$(PXE_ROM_PCI_ID).rom $(project_dir)/ipxe.rom
 ifeq ($(CONSOLE_SERIAL),yy)
 	cp "$(project_dir)/src/config/console.h.cb" "$(project_dir)/src/config/console.h"

src/include/version.h

@@ -14,9 +14,6 @@ extern const unsigned int coreboot_version_timestamp;
 
 /* When coreboot was compiled */
 extern const char coreboot_compile_time[];
-extern const char coreboot_compile_by[];
-extern const char coreboot_compile_host[];
-extern const char coreboot_compile_domain[];
 extern const char coreboot_dmi_date[];
 
 struct bcd_date {

src/lib/coreboot_table.c

@@ -282,9 +282,6 @@ static void lb_strings(struct lb_header *header)
 		{ LB_TAG_EXTRA_VERSION,  coreboot_extra_version,  },
 		{ LB_TAG_BUILD,          coreboot_build,          },
 		{ LB_TAG_COMPILE_TIME,   coreboot_compile_time,   },
-		{ LB_TAG_COMPILE_BY,     coreboot_compile_by,     },
-		{ LB_TAG_COMPILE_HOST,   coreboot_compile_host,   },
-		{ LB_TAG_COMPILE_DOMAIN, coreboot_compile_domain, },
 	};
 	unsigned int i;
 	for(i = 0; i < ARRAY_SIZE(strings); i++) {

src/lib/version.c

@@ -18,12 +18,6 @@
 #ifndef COREBOOT_COMPILE_TIME
 #error  COREBOOT_COMPILE_TIME not defined
 #endif
-#ifndef COREBOOT_COMPILE_BY
-#error  COREBOOT_COMPILE_BY not defined
-#endif
-#ifndef COREBOOT_COMPILE_HOST
-#error  COREBOOT_COMPILE_HOST not defined
-#endif
 
 #ifndef  COREBOOT_EXTRA_VERSION
 #define COREBOOT_EXTRA_VERSION ""
@@ -43,9 +37,6 @@ const char coreboot_build[] = COREBOOT_BUILD;
 const unsigned int coreboot_version_timestamp = COREBOOT_VERSION_TIMESTAMP;
 
 const char coreboot_compile_time[]   = COREBOOT_COMPILE_TIME;
-const char coreboot_compile_by[]     = COREBOOT_COMPILE_BY;
-const char coreboot_compile_host[]   = COREBOOT_COMPILE_HOST;
-const char coreboot_compile_domain[] = COREBOOT_COMPILE_DOMAIN;
 
 const char coreboot_dmi_date[]       = COREBOOT_DMI_DATE;
 

src/mainboard/pcengines/apu2/BiosCallOuts.c

@@ -110,7 +110,12 @@ static AGESA_STATUS Fch_Oem_config(UINT32 Func, UINT32 FchData, VOID *ConfigPtr)
 
 		/* EHCI configuration */
 		FchParams->Usb.Ehci3Enable = !IS_ENABLED(CONFIG_HUDSON_XHCI_ENABLE);
-		FchParams->Usb.Ehci1Enable = check_ehci0();
+		if (IS_ENABLED(CONFIG_BOARD_PCENGINES_APU2)) {
+			// Disable EHCI 0 (port 0 to 3)
+			FchParams->Usb.Ehci1Enable = FALSE;
+		} else {
+			FchParams->Usb.Ehci1Enable = check_ehci0();
+		}
 		FchParams->Usb.Ehci2Enable = TRUE;	// Enable EHCI 1 ( port 4 to 7) port 4 and 5 to EHCI header port 6 and 7 to PCIe slot.
 
 		/* sata configuration */

src/mainboard/pcengines/apu2/Makefile.inc

@@ -128,6 +128,7 @@ ipxe: $(DOTCONFIG)
 			IPXE_UART=$(IPXE_UART) \
 			CONFIG_TTYS0_BAUD=$(CONFIG_TTYS0_BAUD) \
 			CONFIG_PXE_CUSTOM_GENERAL_H=$(CONFIG_PXE_CUSTOM_GENERAL_H) \
-			CONFIG_PXE_CUSTOM_BOOTMENU_FILE=$(CONFIG_PXE_CUSTOM_BOOTMENU_FILE)
+			CONFIG_PXE_CUSTOM_BOOTMENU_FILE=$(CONFIG_PXE_CUSTOM_BOOTMENU_FILE) \
+			CONFIG_PXE_CUSTOM_BUILD_ID=$(CONFIG_PXE_CUSTOM_BUILD_ID)
 
 subdirs-y += variants/$(VARIANT_DIR)