74 changes: 25 additions & 49 deletions .gitlab-ci.yml
View file
@@ -1,14 +1,13 @@
image: registry.gitlab.com/pcengines/apu2-documentation:latest
image: coreboot/coreboot-sdk:1.50

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
Expand All @@ -17,65 +16,42 @@ 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-ml
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
- web

.test_rom: &test_rom
variables:
PLATFORM:
stage: test_rom
tags:
- docker
script:
- echo "test_rom"
- ls -la ${RELEASE_DIR}/${PLATFORM}_*.rom
only:
- tags
- web

.sign_rom: &sign_rom
variables:
Expand All @@ -84,54 +60,57 @@ build_crosscompiler:
tags:
- docker
script:
- echo "sign_rom"
- for rom in ${RELEASE_DIR}/${PLATFORM}_*.rom; do touch ${rom}_dummy_signature; done
- ls -la ${RELEASE_DIR}/${PLATFORM}_*.rom
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
only:
- tags



build:apu1:
<<: *build_rom_apu
variables:
PLATFORM: apu1
MANIFEST_FALLBACK_BRANCH: coreboot-4.6.x

.test:apu1:
<<: *test_rom
variables:
PLATFORM: apu1

.sign:apu1:
<<: *sign_rom
variables:
PLATFORM: apu1

publish:apu1:
<<: *publish_rom
variables:
PLATFORM: apu1
PLATFORM: apu1


build:apu2:
<<: *build_rom_apu
variables:
PLATFORM: apu2
MANIFEST_FALLBACK_BRANCH: coreboot-4.6.x

.test:apu2:
<<: *test_rom
Expand All @@ -153,7 +132,6 @@ build:apu3:
<<: *build_rom_apu
variables:
PLATFORM: apu3
MANIFEST_FALLBACK_BRANCH: coreboot-4.6.x

.test:apu3:
<<: *test_rom
Expand All @@ -175,7 +153,6 @@ build:apu4:
<<: *build_rom_apu
variables:
PLATFORM: apu4
MANIFEST_FALLBACK_BRANCH: coreboot-4.6.x

.test:apu4:
<<: *test_rom
Expand All @@ -197,7 +174,6 @@ build:apu5:
<<: *build_rom_apu
variables:
PLATFORM: apu5
MANIFEST_FALLBACK_BRANCH: coreboot-4.6.x

.test:apu5:
<<: *test_rom
Expand Down
12 changes: 11 additions & 1 deletion CHANGELOG.md
View file
Expand Up @@ -14,6 +14,15 @@ Releases 4.5.x and 4.6.x are based on mainline support submitted in

## [Unreleased]

## [v4.6.9] - 2018-05-11
### Added
- Infrastructure to include microcode update
- Support for new building system pce-fw-builder

### Fixed
- Building is now possible with official coreboot-sdk container
- Retrieving board serial number

## [v4.6.8] - 2018-04-06
### Added
- Full feature and build support for APU1
Expand Down Expand Up @@ -168,7 +177,8 @@ redundant code which was similar for APU2/3/5 boards.
- turn off D4 and D5 leds on boot
- enable power on after power failure

[Unreleased]: https://github.com/pcengines/coreboot/compare/v4.6.8...coreboot-4.6.x
[Unreleased]: https://github.com/pcengines/coreboot/compare/v4.6.9...coreboot-4.6.x
[v4.6.9]: https://github.com/pcengines/coreboot/compare/v4.6.8...v4.6.9
[v4.6.8]: https://github.com/pcengines/coreboot/compare/v4.6.7...v4.6.8
[v4.6.7]: https://github.com/pcengines/coreboot/compare/v4.6.6...v4.6.7
[v4.6.6]: https://github.com/pcengines/coreboot/compare/v4.6.5...v4.6.6
Expand Down
4 changes: 2 additions & 2 deletions configs/pcengines_apu1.config
View file
Expand Up @@ -615,8 +615,8 @@ CONFIG_IPXE_STABLE=y
# CONFIG_IPXE_MASTER is not set
# CONFIG_PXE_SERIAL_CONSOLE is not set
CONFIG_PXE_ROM_ID="10ec,8168"
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_COMPRESSED_PAYLOAD_LZMA=y
# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set

Expand Down
4 changes: 2 additions & 2 deletions configs/pcengines_apu2.config
View file
Expand Up @@ -630,8 +630,8 @@ CONFIG_IPXE_STABLE=y
# CONFIG_IPXE_MASTER is not set
# 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_COMPRESSED_PAYLOAD_LZMA=y
# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set

Expand Down
4 changes: 2 additions & 2 deletions configs/pcengines_apu3.config
View file
Expand Up @@ -630,8 +630,8 @@ CONFIG_IPXE_STABLE=y
# CONFIG_IPXE_MASTER is not set
# 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_COMPRESSED_PAYLOAD_LZMA=y
# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set

Expand Down
4 changes: 2 additions & 2 deletions configs/pcengines_apu4.config
View file
Expand Up @@ -630,8 +630,8 @@ CONFIG_IPXE_STABLE=y
# CONFIG_IPXE_MASTER is not set
# 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_COMPRESSED_PAYLOAD_LZMA=y
# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set

Expand Down
4 changes: 2 additions & 2 deletions configs/pcengines_apu5.config
View file
Expand Up @@ -628,8 +628,8 @@ CONFIG_IPXE_STABLE=y
# CONFIG_IPXE_MASTER is not set
# 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_COMPRESSED_PAYLOAD_LZMA=y
# CONFIG_PAYLOAD_IS_FLAT_BINARY is not set

Expand Down