diff options
| -rw-r--r-- | config/coreboot/g43t_am3/config/libgfxinit_txtmode | 2 | ||||
| -rw-r--r-- | config/coreboot/g43t_am3_16mb/config/libgfxinit_txtmode | 2 | ||||
| -rw-r--r-- | config/data/coreboot/0 | bin | 0 -> 1 bytes | |||
| -rw-r--r-- | include/lib.sh | 10 |
4 files changed, 9 insertions, 5 deletions
diff --git a/config/coreboot/g43t_am3/config/libgfxinit_txtmode b/config/coreboot/g43t_am3/config/libgfxinit_txtmode index 039c3bbb..6cb5f3be 100644 --- a/config/coreboot/g43t_am3/config/libgfxinit_txtmode +++ b/config/coreboot/g43t_am3/config/libgfxinit_txtmode @@ -145,7 +145,7 @@ CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xe0000000 CONFIG_ECAM_MMCONF_BUS_NUMBER=256 CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld" # CONFIG_FATAL_ASSERTS is not set -CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt" +CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt" CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="G43T-AM3" # CONFIG_CONSOLE_POST is not set diff --git a/config/coreboot/g43t_am3_16mb/config/libgfxinit_txtmode b/config/coreboot/g43t_am3_16mb/config/libgfxinit_txtmode index 34d2fef6..89964024 100644 --- a/config/coreboot/g43t_am3_16mb/config/libgfxinit_txtmode +++ b/config/coreboot/g43t_am3_16mb/config/libgfxinit_txtmode @@ -145,7 +145,7 @@ CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xe0000000 CONFIG_ECAM_MMCONF_BUS_NUMBER=256 CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld" # CONFIG_FATAL_ASSERTS is not set -CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt" +CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/data.vbt" CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="G43T-AM3" # CONFIG_CONSOLE_POST is not set diff --git a/config/data/coreboot/0 b/config/data/coreboot/0 Binary files differnew file mode 100644 index 00000000..f76dd238 --- /dev/null +++ b/config/data/coreboot/0 diff --git a/include/lib.sh b/include/lib.sh index 21066ecc..47b16100 100644 --- a/include/lib.sh +++ b/include/lib.sh @@ -99,13 +99,17 @@ done pyver="2" python="python3" -command -v python3 1>/dev/null || python="python" +if command -v python3 1>/dev/null; then + pyver="3" +else + python="python" +fi command -v $python 1>/dev/null || pyver="" [ -z "$pyver" ] || \ - python -c 'import sys; print(sys.version_info[:])' 1>/dev/null \ + $python -c 'import sys; print(sys.version_info[:])' 1>/dev/null \ 2>/dev/null || $err "Cannot determine which Python version." [ -n "$pyver" ] && \ - pyver="`python -c 'import sys; print(sys.version_info[:])' | \ + pyver="`$python -c 'import sys; print(sys.version_info[:])' | \ awk '{print $1}'`" && \ pyver="${pyver#(}" && pyver="${pyver%,}" if [ "${pyver%%.*}" != "3" ]; then |