10 changes: 9 additions & 1 deletion CHANGELOG.md
View file
Expand Up @@ -8,6 +8,13 @@ Releases 4.5.x are based on mainline support submitted in

## [Unreleased]

## [v4.0.10] - 2017-06-30
### Added
- added sortbootorder to option menu

### Changed
- updated sortbootorder to v4.5.6

## [v4.0.9] - 2017-05-30
### Changed
- updated sortbootorder to v4.0.6
Expand Down Expand Up @@ -95,7 +102,8 @@ Releases 4.5.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.9...coreboot-4.0.x
[Unreleased]: https://github.com/pcengines/coreboot/compare/v4.0.10...coreboot-4.0.x
[v4.0.10]: https://github.com/pcengines/coreboot/compare/v4.0.9...v4.0.10
[v4.0.9]: https://github.com/pcengines/coreboot/compare/v4.0.8...v4.0.9
[v4.0.8]: https://github.com/pcengines/coreboot/compare/v4.0.7.2...v4.0.8
[v4.0.7.2]: https://github.com/pcengines/coreboot/compare/v4.0.7.1...v4.0.7.2
Expand Down
6 changes: 6 additions & 0 deletions Makefile.inc
View file
Expand Up @@ -560,6 +560,9 @@ 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)-)))

Expand Down Expand Up @@ -658,6 +661,9 @@ 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)
endif
ifeq ($(CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE),y)
ifeq ($(CONFIG_CPU_MICROCODE_ADDED_DURING_BUILD),y)
@printf " UPDATE-FIT \n"
Expand Down
3 changes: 2 additions & 1 deletion configs/pcengines_apu2.config
View file
Expand Up @@ -7,7 +7,7 @@
# General setup
#
# CONFIG_EXPERT is not set
CONFIG_LOCALVERSION="4.0.9"
CONFIG_LOCALVERSION="4.0.10"
CONFIG_CBFS_PREFIX="fallback"
CONFIG_COMPILER_GCC=y
# CONFIG_COMPILER_LLVM_CLANG is not set
Expand Down Expand Up @@ -397,6 +397,7 @@ CONFIG_SEABIOS_SERIAL_CONSOLE=y
CONFIG_SEABIOS_MALLOC_UPPERMEMORY=y
CONFIG_PAYLOAD_FILE="payloads/external/SeaBIOS/seabios/out/bios.bin.elf"
CONFIG_COMPRESSED_PAYLOAD_LZMA=y
CONFIG_SORTBOOTORDER=y

#
# Debugging
Expand Down
3 changes: 2 additions & 1 deletion configs/pcengines_apu3.config
View file
Expand Up @@ -7,7 +7,7 @@
# General setup
#
# CONFIG_EXPERT is not set
CONFIG_LOCALVERSION="4.0.9"
CONFIG_LOCALVERSION="4.0.10"
CONFIG_CBFS_PREFIX="fallback"
CONFIG_COMPILER_GCC=y
# CONFIG_COMPILER_LLVM_CLANG is not set
Expand Down Expand Up @@ -397,6 +397,7 @@ CONFIG_SEABIOS_SERIAL_CONSOLE=y
CONFIG_SEABIOS_MALLOC_UPPERMEMORY=y
CONFIG_PAYLOAD_FILE="payloads/external/SeaBIOS/seabios/out/bios.bin.elf"
CONFIG_COMPRESSED_PAYLOAD_LZMA=y
CONFIG_SORTBOOTORDER=y

#
# Debugging
Expand Down
31 changes: 31 additions & 0 deletions payloads/external/sortbootorder/Makefile.inc
View file
@@ -0,0 +1,31 @@
version=4.5.6
branch_name=v$(version)
project_url=https://github.com/pcengines/sortbootorder/archive/$(branch_name).tar.gz
archive_name=$(branch_name).tar.gz

unexport KCONFIG_AUTOHEADER
unexport KCONFIG_AUTOCONFIG
unexport KCONFIG_DEPENDENCIES
unexport KCONFIG_SPLITCONFIG
unexport KCONFIG_TRISTATE
unexport KCONFIG_NEGATIVES

all: sortbootorder

sortbootorder: download
echo " MAKE sortbootorder "
$(MAKE) -C sortbootorder COREBOOT_REL=legacy

download:
test -d sortbootorder || { wget $(project_url); \
tar -xvf $(archive_name); \
rm $(archive_name); \
mv sortbootorder-$(version) sortbootorder; }

clean:
test -d sortbootorder && $(MAKE) -C sortbootorder clean || exit 0

distclean:
rm -rf sortbootorder

.PHONY: download patch sortbootorder clean distclean
Empty file modified payloads/libpayload/bin/lpas 100644 → 100755
View file
Empty file.
Empty file modified payloads/libpayload/bin/lpgcc 100644 → 100755
View file
Empty file.
8 changes: 8 additions & 0 deletions payloads/libpayload/configs/defconfig-tinycurses
View file
@@ -0,0 +1,8 @@
# CONFIG_LP_MULTIBOOT is not set
CONFIG_LP_TINYCURSES=y
CONFIG_LP_COREBOOT_VIDEO_CONSOLE=y
CONFIG_LP_USB=y
CONFIG_LP_USB_UHCI=y
CONFIG_LP_USB_OHCI=y
CONFIG_LP_USB_EHCI=y
CONFIG_LP_USB_XHCI=y
Empty file modified payloads/libpayload/util/kconfig/check.sh 100644 → 100755
View file
Empty file.
Empty file modified payloads/libpayload/util/kconfig/lxdialog/check-lxdialog.sh 100644 → 100755
View file
Empty file.
Binary file removed payloads/pcengines/sortbootorder.elf-payload
View file
Binary file not shown.
7 changes: 7 additions & 0 deletions src/Kconfig
View file
Expand Up @@ -750,6 +750,13 @@ config LINUX_INITRD
help
An initrd image to add to the Linux kernel.

config SORTBOOTORDER
bool "sortbootorder"
depends on BOARD_PCENGINES_APU2 || BOARD_PCENGINES_APU3
default y
help
APU2/3 setup utility

endmenu

menu "Debugging"
Expand Down
3 changes: 3 additions & 0 deletions src/arch/x86/Makefile.inc
View file
Expand Up @@ -360,3 +360,6 @@ grub2:
CC="$(CC_x86_32)" LD="$(LD_x86_32)" OBJDUMP="$(OBJDUMP_x86_32)" \
OBJCOPY="$(OBJCOPY_x86_32)" STRIP="$(STRIP_x86_32)" \
CONFIG_GRUB2_MASTER=$(CONFIG_GRUB2_MASTER)

sortbootorder:
$(MAKE) -C payloads/external/sortbootorder -f Makefile.inc
5 changes: 0 additions & 5 deletions src/mainboard/pcengines/apu2/Makefile.inc
View file
Expand Up @@ -35,11 +35,6 @@ img/memtest-position := 0xcd900
img/memtest-type := payload
# WIV20150202 add ramtest

# setup payload
cbfs-files-y += img/setup
img/setup-file := payloads/pcengines/sortbootorder.elf-payload
img/setup-type := payload

cbfs-files-y += bootorder_map
bootorder_map-file := bootorder_map
bootorder_map-type := raw
Expand Down
5 changes: 0 additions & 5 deletions src/mainboard/pcengines/apu3/Makefile.inc
View file
Expand Up @@ -35,11 +35,6 @@ img/memtest-position := 0xcd900
img/memtest-type := payload
# WIV20150202 add ramtest

# setup payload
cbfs-files-y += img/setup
img/setup-file := payloads/pcengines/sortbootorder.elf-payload
img/setup-type := payload

cbfs-files-y += bootorder_map
bootorder_map-file := bootorder_map
bootorder_map-type := raw
Expand Down