armada: machine.conf: Update u-boot configs
BugzID: 77953
This commit is contained in:
parent
e284973988
commit
cd3f47b05b
|
|
@ -7,9 +7,8 @@ require conf/machine/include/armada.inc
|
||||||
SERIAL_CONSOLE = "115200 ttyS1"
|
SERIAL_CONSOLE = "115200 ttyS1"
|
||||||
MACHINE_EXTRA_RRECOMMENDS = " kernel-modules kernel-devicetree"
|
MACHINE_EXTRA_RRECOMMENDS = " kernel-modules kernel-devicetree"
|
||||||
|
|
||||||
KERNEL_DEFCONFIG ??= "nbhw_defconfig"
|
UBOOT_MACHINE = "armada-385-hw17_defconfig"
|
||||||
KERNEL_DEVICETREE = "armada-385-nbhw17-prod1.dtb"
|
IMAGE_BOOT_FILES = "u-boot-armada-385-hw17.kwb"
|
||||||
KERNEL_IMAGETYPE = "zImage"
|
|
||||||
|
|
||||||
PREFERRED_PROVIDER_virtual/kernel = "linux-netmodule"
|
PREFERRED_PROVIDER_virtual/kernel = "linux-netmodule"
|
||||||
PV_pn-linux-netmodule = "4.12.0-${SRCPV}"
|
PV_pn-linux-netmodule = "4.12.0-${SRCPV}"
|
||||||
|
|
|
||||||
|
|
@ -12,9 +12,8 @@ KERNEL_DEVICETREE_TO_USE = "${HW18_DT}"
|
||||||
KERNEL_MODULE_PROBECONF += "ath10k_pci"
|
KERNEL_MODULE_PROBECONF += "ath10k_pci"
|
||||||
module_conf_ath10k_pci = "options ath10k_pci irq_mode=1"
|
module_conf_ath10k_pci = "options ath10k_pci irq_mode=1"
|
||||||
|
|
||||||
PREFERRED_PROVIDER_virtual/bootloader = "u-boot-armada"
|
UBOOT_MACHINE = "armada-385-hw18_defconfig"
|
||||||
UBOOT_MACHINE = "armada-385-nrhw18-v2_defconfig"
|
IMAGE_BOOT_FILES = "u-boot-armada-385-hw18.kwb"
|
||||||
IMAGE_BOOT_FILES = "u-boot-armada-385-nrhw18-v2.kwb"
|
|
||||||
|
|
||||||
DEFAULT_ETH = "eth2"
|
DEFAULT_ETH = "eth2"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -6,8 +6,8 @@ DEFAULTTUNE ?= "cortexa9thf-neon"
|
||||||
require conf/machine/include/tune-cortexa9.inc
|
require conf/machine/include/tune-cortexa9.inc
|
||||||
|
|
||||||
# Default providers, may need to override for specific machines
|
# Default providers, may need to override for specific machines
|
||||||
PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
|
PREFERRED_PROVIDER_virtual/bootloader = "u-boot-armada"
|
||||||
PREFERRED_PROVIDER_u-boot = "u-boot"
|
PREFERRED_PROVIDER_u-boot = "u-boot-armada"
|
||||||
|
|
||||||
UBOOT_ARCH = "arm"
|
UBOOT_ARCH = "arm"
|
||||||
UBOOT_MACHINE = "mvebu_db_armada8k_config"
|
UBOOT_MACHINE = "mvebu_db_armada8k_config"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue