diff options
| -rw-r--r-- | config/data/grub/cfg/default.config (renamed from config/module/grub/default/config/payload) | 0 | ||||
| -rw-r--r-- | config/data/grub/cfg/nvme.config (renamed from config/module/grub/nvme/config/payload) | 0 | ||||
| -rw-r--r-- | config/data/grub/cfg/xhci_nvme.config (renamed from config/module/grub/xhci_nvme/config/payload) | 0 | ||||
| -rw-r--r-- | config/data/grub/mkhelper.cfg | 2 | ||||
| -rw-r--r-- | include/fw/rom.sh | 4 | ||||
| -rwxr-xr-x | mk | 7 |
6 files changed, 11 insertions, 2 deletions
diff --git a/config/module/grub/default/config/payload b/config/data/grub/cfg/default.config index 3d84413e..3d84413e 100644 --- a/config/module/grub/default/config/payload +++ b/config/data/grub/cfg/default.config diff --git a/config/module/grub/nvme/config/payload b/config/data/grub/cfg/nvme.config index 4f3de36e..4f3de36e 100644 --- a/config/module/grub/nvme/config/payload +++ b/config/data/grub/cfg/nvme.config diff --git a/config/module/grub/xhci_nvme/config/payload b/config/data/grub/cfg/xhci_nvme.config index 9db22fe2..9db22fe2 100644 --- a/config/module/grub/xhci_nvme/config/payload +++ b/config/data/grub/cfg/xhci_nvme.config diff --git a/config/data/grub/mkhelper.cfg b/config/data/grub/mkhelper.cfg index 4bf0536a..9e8dee58 100644 --- a/config/data/grub/mkhelper.cfg +++ b/config/data/grub/mkhelper.cfg @@ -8,3 +8,5 @@ bootstrapargs="--gnulib-srcdir=gnulib/ --no-git" configureargs="--with-platform=coreboot --disable-werror" makeargs="FS_PAYLOAD_MODULES=\"\"" mkhelper="$if_not_dry_build mkpayload_grub" + +noconfig="y" diff --git a/include/fw/rom.sh b/include/fw/rom.sh index fcd2d30a..9047dd44 100644 --- a/include/fw/rom.sh +++ b/include/fw/rom.sh @@ -51,7 +51,7 @@ mkpayload_grub() -O i386-coreboot -o "$srcdir/grub.elf" -d "${srcdir}/grub-core/" \ --fonts= --themes= --locales= --modules="$grub_modules" \ --install-modules="$grub_install_modules" \ - "/boot/grub/grub_default.cfg=${srcdir}/.config" \ + "/boot/grub/grub_default.cfg=$grubdata/cfg/$tree.config" \ "/boot/grub/grub.cfg=$grubdata/memdisk.cfg"; : } @@ -156,7 +156,7 @@ mkcorebootbin_real() grub_scan_disk="nvme ahci ata" [ -z "$grubtree" ] && \ grubtree="default" - grubelf="elf/grub/$grubtree/$grubtree/payload/grub.elf" + grubelf="elf/grub/$grubtree/$grubtree/noconfig/grub.elf" [ "$payload_memtest" != "y" ] && \ payload_memtest="n" @@ -204,6 +204,10 @@ handle_target() [ "$XBMK_RELEASE" = "y" ] && [ "$release" = "n" ] && \ return 0 + # if using configs, we never build from the master target + [ "$noconfig" != "y" ] && [ "$tree" = "$target" ] && \ + return 0 + $if_build $if_not_fetch \ x_ $postmake; : } @@ -247,6 +251,9 @@ configure_target() delete_old_project_files [ ! -f "CHANGELOG" ] && x_ fetch_trees; : + + [ "$noconfig" != "y" ] && [ "$tree" = "$target" ] && \ + return 1; : } try_target_config() |