7 changes: 4 additions & 3 deletions .gitlab-ci.yml
Expand Up @@ -57,12 +57,13 @@ check_dependencies:
tags:
- docker
script:
- sha256sum ${RELEASE_DIR}/${PLATFORM}_${CI_COMMIT_REF_NAME}.rom > ${RELEASE_DIR}/${PLATFORM}_${CI_COMMIT_REF_NAME}.rom.SHA256
- cd ${RELEASE_DIR}
- sha256sum ${PLATFORM}_${CI_COMMIT_REF_NAME}.rom > ${PLATFORM}_${CI_COMMIT_REF_NAME}.SHA256
- ls -la ${RELEASE_DIR}
artifacts:
name: ${PLATFORM}
paths:
- ${RELEASE_DIR}/${PLATFORM}_${CI_COMMIT_REF_NAME}.rom.SHA256
- ${RELEASE_DIR}/${PLATFORM}_${CI_COMMIT_REF_NAME}.SHA256
only:
- tags
- web
Expand All @@ -78,7 +79,7 @@ check_dependencies:
- curl -u ${UPLOADER_USERNAME}:${UPLOADER_PASSWORD} -X MKCOL ${UPLOADER_URL}/releases/
- curl -u ${UPLOADER_USERNAME}:${UPLOADER_PASSWORD} -X MKCOL "${UPLOADER_URL}/releases/${CI_COMMIT_REF_NAME}/"
- curl --fail -u ${UPLOADER_USERNAME}:${UPLOADER_PASSWORD} -T ${RELEASE_DIR}/${PLATFORM}_${CI_COMMIT_REF_NAME}.rom ${UPLOADER_URL}/releases/${CI_COMMIT_REF_NAME}/
- curl --fail -u ${UPLOADER_USERNAME}:${UPLOADER_PASSWORD} -T ${RELEASE_DIR}/${PLATFORM}_${CI_COMMIT_REF_NAME}.rom.SHA256 ${UPLOADER_URL}/releases/${CI_COMMIT_REF_NAME}/
- curl --fail -u ${UPLOADER_USERNAME}:${UPLOADER_PASSWORD} -T ${RELEASE_DIR}/${PLATFORM}_${CI_COMMIT_REF_NAME}.SHA256 ${UPLOADER_URL}/releases/${CI_COMMIT_REF_NAME}/
only:
- tags

Expand Down
10 changes: 9 additions & 1 deletion CHANGELOG.md
Expand Up @@ -7,6 +7,13 @@ 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.27] - 2019-07-05
### Changed
- [updated SeaBIOS to rel-1.12.1.3](https://github.com/pcengines/seabios/blob/apu_support/CHANGELOG.md#rel-11213---2019-07-05)
- [updated sortbootorder to v4.6.15](https://github.com/pcengines/sortbootorder/blob/master/CHANGELOG.md#v4615---2019-07-05)
- disabled IPv6 in iPXE that often caused the dhcp/autoboot command to time out
- updated iPXE revision to the 2019.3

## [v4.0.26] - 2019-06-07
### Changed
- [updated SeaBIOS to rel-1.12.1.2](https://github.com/pcengines/seabios/blob/apu_support/CHANGELOG.md#rel-11212---2019-06-04)
Expand Down Expand Up @@ -239,7 +246,8 @@ built externally
- forced to use SD in 2.0 mode
- git repository in `Makefile`

[Unreleased]: https://github.com/pcengines/coreboot/compare/v4.0.25...coreboot-4.0.x
[Unreleased]: https://github.com/pcengines/coreboot/compare/v4.0.26...coreboot-4.0.x
[v4.0.26]: https://github.com/pcengines/coreboot/compare/v4.0.25...v4.0.26
[v4.0.25]: https://github.com/pcengines/coreboot/compare/v4.0.24...v4.0.25
[v4.0.24]: https://github.com/pcengines/coreboot/compare/v4.0.23...v4.0.24
[v4.0.23]: https://github.com/pcengines/coreboot/compare/v4.0.22...v4.0.23
Expand Down
2 changes: 1 addition & 1 deletion configs/pcengines_apu2.config
Expand Up @@ -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.12.1.2"
CONFIG_SEABIOS_REVISION_ID="rel-1.12.1.3"
CONFIG_SEABIOS_ADD_SERCON_PORT_FILE=y
CONFIG_SEABIOS_SERCON_PORT_ADDR=0x3f8
# CONFIG_SEABIOS_THREAD_OPTIONROMS is not set
Expand Down
2 changes: 1 addition & 1 deletion configs/pcengines_apu3.config
Expand Up @@ -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.12.1.2"
CONFIG_SEABIOS_REVISION_ID="rel-1.12.1.3"
CONFIG_SEABIOS_ADD_SERCON_PORT_FILE=y
CONFIG_SEABIOS_SERCON_PORT_ADDR=0x3f8
# CONFIG_SEABIOS_THREAD_OPTIONROMS is not set
Expand Down
2 changes: 1 addition & 1 deletion configs/pcengines_apu4.config
Expand Up @@ -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.12.1.2"
CONFIG_SEABIOS_REVISION_ID="rel-1.12.1.3"
CONFIG_SEABIOS_ADD_SERCON_PORT_FILE=y
CONFIG_SEABIOS_SERCON_PORT_ADDR=0x3f8
# CONFIG_SEABIOS_THREAD_OPTIONROMS is not set
Expand Down
2 changes: 1 addition & 1 deletion configs/pcengines_apu5.config
Expand Up @@ -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.12.1.2"
CONFIG_SEABIOS_REVISION_ID="rel-1.12.1.3"
CONFIG_SEABIOS_ADD_SERCON_PORT_FILE=y
CONFIG_SEABIOS_SERCON_PORT_ADDR=0x3f8
# CONFIG_SEABIOS_THREAD_OPTIONROMS is not set
Expand Down
4 changes: 2 additions & 2 deletions payloads/external/iPXE/Kconfig
Expand Up @@ -42,12 +42,12 @@ choice
depends on BUILD_IPXE

config IPXE_STABLE
bool "2017.3"
bool "2019.3"
help
iPXE uses a rolling release with no stable version, for
reproducibility, use the last commit of a given month as the
'stable' version.
This is iPXE from the end of March, 2017.
This is iPXE from the end of March, 2019.

config IPXE_MASTER
bool "master"
Expand Down
2 changes: 1 addition & 1 deletion payloads/external/iPXE/Makefile.inc
@@ -1,4 +1,4 @@
STABLE_COMMIT_ID=fd6d1f4660a37d75acba1c64e2e5f137307bbc31
STABLE_COMMIT_ID=ebf2eaf515e46abd43bc798e7e4ba77bfe529218

TAG-$(CONFIG_IPXE_MASTER)=origin/master
TAG-$(CONFIG_IPXE_STABLE)=$(STABLE_COMMIT_ID)
Expand Down
44 changes: 43 additions & 1 deletion payloads/external/iPXE/general.h
@@ -1,10 +1,23 @@
#ifndef CONFIG_GENERAL_H
#define CONFIG_GENERAL_H

/** @file
*
* General configuration
*
*/

FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );

#include <config/defaults.h>

/*
* Network protocols
*
*/

#define NET_PROTO_IPV4 /* IPv4 protocol */
#define NET_PROTO_IPV6 /* IPv6 protocol */
#undef NET_PROTO_IPV6 /* IPv6 protocol */
#undef NET_PROTO_FCOE /* Fibre Channel over Ethernet protocol */
#define NET_PROTO_STP /* Spanning Tree protocol */

Expand Down Expand Up @@ -134,3 +147,32 @@
*
*/
#define ERRMSG_80211 /* All 802.11 error descriptions (~3.3kb) */

/*
* Obscure configuration options
*
* You probably don't need to touch these.
*
*/

#undef BUILD_SERIAL /* Include an automatic build serial
* number. Add "bs" to the list of
* make targets. For example:
* "make bin/rtl8139.dsk bs" */
#undef BUILD_ID /* Include a custom build ID string,
* e.g "test-foo" */
#undef NULL_TRAP /* Attempt to catch NULL function calls */
#undef GDBSERIAL /* Remote GDB debugging over serial */
#undef GDBUDP /* Remote GDB debugging over UDP
* (both may be set) */
//#define EFI_DOWNGRADE_UX /* Downgrade UEFI user experience */
#define TIVOLI_VMM_WORKAROUND /* Work around the Tivoli VMM's garbling of SSE
* registers when iPXE traps to it due to
* privileged instructions */

#include <config/named.h>
#include NAMED_CONFIG(general.h)
#include <config/local/general.h>
#include LOCAL_NAMED_CONFIG(general.h)

#endif /* CONFIG_GENERAL_H */
2 changes: 1 addition & 1 deletion payloads/external/sortbootorder/Makefile.inc
@@ -1,4 +1,4 @@
version=4.6.14
version=4.6.15
branch_name=v$(version)
project_url=https://github.com/pcengines/sortbootorder/archive/$(branch_name).tar.gz
archive_name=$(branch_name).tar.gz
Expand Down