Skip to content

Commit

Permalink
Merge pull request #1 from linux-sunxi/master
Browse files Browse the repository at this point in the history 
Update
  • Loading branch information
Noxenious committed Jul 17, 2015
2 parents d60ad7f + 6e6e7bd commit bea5512
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ These versions are rather old (3.4 for kernel and 2014.04 for U-Boot), but may s
If you want to switch back to sunxi versions for some reasons (no device tree available, unsupported hardware), change the file
/conf/machine/include/sunxi.inc and set

PREFERRED_PROVIDER_u-boot=u-boot-sunxi
PREFERRED_PROVIDER_virtual/bootloader=u-boot-sunxi
PREFERRED_PROVIDER_virtual/kernel=linux-sunxi
PREFERRED_PROVIDER_u-boot="u-boot-sunxi"
PREFERRED_PROVIDER_virtual/bootloader="u-boot-sunxi"
PREFERRED_PROVIDER_virtual/kernel="linux-sunxi"

If you already have built the mainline versions it might be necessary to reset the build directories with:

Expand Down
6 changes: 3 additions & 3 deletions conf/machine/cubieboard2.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@

require conf/machine/include/sun7i.inc

KERNEL_DEVICETREE = "sun7i-a20-cubieboard2.dtb
UBOOT_MACHINE = "Cubieboard_config"
SUNXI_FEX_FILE = "sys_config/a20/cubieboard2.fex"
KERNEL_DEVICETREE = "sun7i-a20-cubieboard2.dtb"
UBOOT_MACHINE = "Cubieboard2_config"
SUNXI_FEX_FILE = "sys_config/a20/cubieboard2.fex"

0 comments on commit bea5512

Please sign in to comment.