[openfirmware] [commit] r3767 - in cpu: arm arm/olpc x86/pc/olpc
repository service
svn at openfirmware.info
Fri Jan 30 03:32:18 CET 2015
Author: quozl
Date: Fri Jan 30 03:32:17 2015
New Revision: 3767
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3767
Log:
OLPC XO-4 - suppress device tree changes when booting alternate operating system, fixes #12855.
Modified:
cpu/arm/linux.fth
cpu/arm/olpc/build-fw.fth
cpu/x86/pc/olpc/security.fth
Modified: cpu/arm/linux.fth
==============================================================================
--- cpu/arm/linux.fth Fri Jan 16 02:18:09 2015 (r3766)
+++ cpu/arm/linux.fth Fri Jan 30 03:32:17 2015 (r3767)
@@ -107,7 +107,7 @@
\ args-buf cscount set-parameters ( )
\ then
disable-interrupts
-[ifdef] mmp3-gic mmp3-gic [then]
+ [ifdef] mmp3-gic no-mmp3-gic? 0= if mmp3-gic then [then]
linux-base linux-base (init-program) \ Starting address, SP
0 to r0
Modified: cpu/arm/olpc/build-fw.fth
==============================================================================
--- cpu/arm/olpc/build-fw.fth Fri Jan 16 02:18:09 2015 (r3766)
+++ cpu/arm/olpc/build-fw.fth Fri Jan 30 03:32:17 2015 (r3767)
@@ -254,7 +254,10 @@
: wlan-reset ( -- ) wlan-reset-gpio# gpio-clr d# 20 ms wlan-reset-gpio# gpio-set ;
fload ${BP}/ofw/core/fdt.fth
-[ifdef] mmp3 autoload: mmp3-gic- defines: mmp3-gic [then]
+[ifdef] mmp3
+ autoload: mmp3-gic- defines: mmp3-gic
+ 0 value no-mmp3-gic?
+[then]
fload ${BP}/cpu/arm/linux.fth
\ Create the alias unless it already exists
Modified: cpu/x86/pc/olpc/security.fth
==============================================================================
--- cpu/x86/pc/olpc/security.fth Fri Jan 16 02:18:09 2015 (r3766)
+++ cpu/x86/pc/olpc/security.fth Fri Jan 30 03:32:17 2015 (r3767)
@@ -1320,7 +1320,13 @@
load-crypto if " Crypto load failed" .security-failure then ( )
- alternate? if " \boot-alt" else " \boot" then pn-buf place
+ alternate? if
+ [ifdef] mmp3 true to no-mmp3-gic? [then]
+ " \boot-alt"
+ else
+ " \boot"
+ then
+ pn-buf place
key? if
pending-char c@ h# 1b = if
More information about the openfirmware
mailing list