diff --git a/share/arm.tmpl b/share/arm.tmpl index 610d113c..637e13fd 100644 --- a/share/arm.tmpl +++ b/share/arm.tmpl @@ -9,11 +9,7 @@ LIVEDIR="LiveOS" # different platforms use different kernel load addresses. # include a 'baseline' kernel for no 'flavor'. kernelAddress = { 'baseline' : '0x00008000', - 'highbank' : '0x00008000', - 'imx' : '0x90008000', - 'kirkwood' : '0x00008000', - 'mvebu' : '0x00008000', - 'omap' : '0x80008000', + 'lpae' : '0x00008000', 'tegra' : '0x00008000', } diff --git a/share/runtime-install.tmpl b/share/runtime-install.tmpl index e8ae7b72..c02159c5 100644 --- a/share/runtime-install.tmpl +++ b/share/runtime-install.tmpl @@ -22,7 +22,7 @@ installpkg kernel ## arch-specific packages (bootloaders etc.) %if basearch in ("arm", "armhfp"): - installpkg kernel-highbank kernel-imx kernel-kirkwood kernel-mvebu kernel-omap kernel-tegra + installpkg kernel-lpae kernel-tegra installpkg uboot-tools %endif %if basearch == "i386": diff --git a/src/pylorax/treebuilder.py b/src/pylorax/treebuilder.py index 4275550d..136aa20f 100644 --- a/src/pylorax/treebuilder.py +++ b/src/pylorax/treebuilder.py @@ -264,7 +264,7 @@ class TreeBuilder(object): def findkernels(root="/", kdir="boot"): # To find possible flavors, awk '/BuildKernel/ { print $4 }' kernel.spec - flavors = ('debug', 'PAE', 'PAEdebug', 'smp', 'xen', 'highbank', 'imx', 'kirkwood', 'mvebu', 'omap', 'tegra') + flavors = ('debug', 'PAE', 'PAEdebug', 'smp', 'xen', 'lpae', 'tegra') kre = re.compile(r"vmlinuz-(?P.+?\.(?P[a-z0-9_]+)" r"(\.(?P{0}))?)$".format("|".join(flavors))) kernels = []