diff options
-rw-r--r-- | meta-ti-bsp/conf/machine/include/omap-a15.inc | 2 | ||||
-rw-r--r-- | meta-ti-bsp/conf/machine/include/ti33x.inc | 4 | ||||
-rw-r--r-- | meta-ti-bsp/conf/machine/include/ti43x.inc | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/meta-ti-bsp/conf/machine/include/omap-a15.inc b/meta-ti-bsp/conf/machine/include/omap-a15.inc index 6187f2ea..a875713f 100644 --- a/meta-ti-bsp/conf/machine/include/omap-a15.inc +++ b/meta-ti-bsp/conf/machine/include/omap-a15.inc | |||
@@ -24,7 +24,7 @@ UBOOT_ARCH = "arm" | |||
24 | UBOOT_ENTRYPOINT = "0x80008000" | 24 | UBOOT_ENTRYPOINT = "0x80008000" |
25 | UBOOT_LOADADDRESS = "0x80008000" | 25 | UBOOT_LOADADDRESS = "0x80008000" |
26 | 26 | ||
27 | DEVICETREE_FILE = "${@(d.getVar('KERNEL_DEVICETREE') or "").replace("ti/","")}" | 27 | DEVICETREE_FILE = "${@(d.getVar('KERNEL_DEVICETREE') or "").replace("ti/omap/","").replace("ti/","")}" |
28 | 28 | ||
29 | # Generate an extlinux.conf file | 29 | # Generate an extlinux.conf file |
30 | UBOOT_EXTLINUX = "1" | 30 | UBOOT_EXTLINUX = "1" |
diff --git a/meta-ti-bsp/conf/machine/include/ti33x.inc b/meta-ti-bsp/conf/machine/include/ti33x.inc index 6cd7e568..b0ed1c69 100644 --- a/meta-ti-bsp/conf/machine/include/ti33x.inc +++ b/meta-ti-bsp/conf/machine/include/ti33x.inc | |||
@@ -44,6 +44,8 @@ UBOOT_MACHINE = "am335x_evm_config" | |||
44 | UBOOT_ENTRYPOINT = "0x80008000" | 44 | UBOOT_ENTRYPOINT = "0x80008000" |
45 | UBOOT_LOADADDRESS = "0x80008000" | 45 | UBOOT_LOADADDRESS = "0x80008000" |
46 | 46 | ||
47 | DEVICETREE_FILE = "${@(d.getVar('KERNEL_DEVICETREE') or "").replace("ti/omap/","")}" | ||
48 | |||
47 | # Generate an extlinux.conf file | 49 | # Generate an extlinux.conf file |
48 | UBOOT_EXTLINUX = "1" | 50 | UBOOT_EXTLINUX = "1" |
49 | UBOOT_EXTLINUX_ROOT = "root=PARTUUID=${uuid}" | 51 | UBOOT_EXTLINUX_ROOT = "root=PARTUUID=${uuid}" |
@@ -51,7 +53,7 @@ UBOOT_EXTLINUX_KERNEL_ARGS = "rootwait rw earlycon" | |||
51 | UBOOT_EXTLINUX_BOOT_FILES = " \ | 53 | UBOOT_EXTLINUX_BOOT_FILES = " \ |
52 | extlinux.conf;extlinux/extlinux.conf \ | 54 | extlinux.conf;extlinux/extlinux.conf \ |
53 | ${KERNEL_IMAGETYPE} \ | 55 | ${KERNEL_IMAGETYPE} \ |
54 | ${KERNEL_DEVICETREE} \ | 56 | ${DEVICETREE_FILE} \ |
55 | " | 57 | " |
56 | 58 | ||
57 | SPL_BINARY = "MLO" | 59 | SPL_BINARY = "MLO" |
diff --git a/meta-ti-bsp/conf/machine/include/ti43x.inc b/meta-ti-bsp/conf/machine/include/ti43x.inc index ec4bd115..17ca5240 100644 --- a/meta-ti-bsp/conf/machine/include/ti43x.inc +++ b/meta-ti-bsp/conf/machine/include/ti43x.inc | |||
@@ -41,13 +41,15 @@ UBOOT_MACHINE = "am43xx_evm_config" | |||
41 | UBOOT_ENTRYPOINT = "0x80008000" | 41 | UBOOT_ENTRYPOINT = "0x80008000" |
42 | UBOOT_LOADADDRESS = "0x80008000" | 42 | UBOOT_LOADADDRESS = "0x80008000" |
43 | 43 | ||
44 | DEVICETREE_FILE = "${@(d.getVar('KERNEL_DEVICETREE') or "").replace("ti/omap/","")}" | ||
45 | |||
44 | # Generate an extlinux.conf file | 46 | # Generate an extlinux.conf file |
45 | UBOOT_EXTLINUX = "1" | 47 | UBOOT_EXTLINUX = "1" |
46 | UBOOT_EXTLINUX_ROOT = "root=PARTUUID=${uuid}" | 48 | UBOOT_EXTLINUX_ROOT = "root=PARTUUID=${uuid}" |
47 | UBOOT_EXTLINUX_BOOT_FILES = " \ | 49 | UBOOT_EXTLINUX_BOOT_FILES = " \ |
48 | extlinux.conf;extlinux/extlinux.conf \ | 50 | extlinux.conf;extlinux/extlinux.conf \ |
49 | ${KERNEL_IMAGETYPE} \ | 51 | ${KERNEL_IMAGETYPE} \ |
50 | ${KERNEL_DEVICETREE} \ | 52 | ${DEVICETREE_FILE} \ |
51 | " | 53 | " |
52 | 54 | ||
53 | SPL_BINARY = "MLO" | 55 | SPL_BINARY = "MLO" |