r150 - in openbios-devel: arch/sparc32 drivers
by svn＠openbios.org
Author: blueswirl
Date: 2007-05-27 21:49:35 +0200 (Sun, 27 May 2007)
New Revision: 150
Modified:
openbios-devel/arch/sparc32/entry.S
openbios-devel/arch/sparc32/romvec.c
openbios-devel/drivers/obio.c
openbios-devel/drivers/obio.h
Log:
Try to fix system reset for SMP and SS-10 cases
Modified: openbios-devel/arch/sparc32/entry.S
===================================================================
--- openbios-devel/arch/sparc32/entry.S 2007-05-19 12:55:01 UTC (rev 149)
+++ openbios-devel/arch/sparc32/entry.S 2007-05-27 19:49:35 UTC (rev 150)
@@ -57,6 +57,7 @@
! Check if this not the first SMP CPU, if so, bypass PROM entirely
set PHYS_JJ_EEPROM + 0x2E, %g1
lduba [%g1] ASI_M_BYPASS, %g2
+ stba %g0, [%g1] ASI_M_BYPASS
set PHYS_JJ_EEPROM + 0x30, %g1
lda [%g1] ASI_M_BYPASS, %g1
tst %g2
@@ -71,15 +72,18 @@
add %g2, 4, %g2
sta %g0, [%g2] ASI_M_BYPASS ! clear softints
set PHYS_JJ_EEPROM + 0x3C, %g1
- lda [%g1] ASI_M_BYPASS, %g1
- set AC_M_CTPR, %g2
- sta %g1, [%g2] ASI_M_MMUREGS ! set ctx table ptr
+ lda [%g1] ASI_M_BYPASS, %g2
+ sta %g0, [%g1] ASI_M_BYPASS
+ set AC_M_CTPR, %g1
+ sta %g2, [%g1] ASI_M_MMUREGS ! set ctx table ptr
set PHYS_JJ_EEPROM + 0x40, %g1
- lda [%g1] ASI_M_BYPASS, %g1
- set AC_M_CXR, %g2
- sta %g1, [%g2] ASI_M_MMUREGS ! set context
+ lda [%g1] ASI_M_BYPASS, %g2
+ sta %g0, [%g1] ASI_M_BYPASS
+ set AC_M_CXR, %g1
+ sta %g2, [%g1] ASI_M_MMUREGS ! set context
set PHYS_JJ_EEPROM + 0x38, %g1
lda [%g1] ASI_M_BYPASS, %g2
+ sta %g0, [%g1] ASI_M_BYPASS
set 1, %g1
jmp %g2 ! jump to kernel
sta %g1, [%g0] ASI_M_MMUREGS ! enable mmu
@@ -111,6 +115,7 @@
! Check if this not the first SMP CPU, if so, bypass PROM entirely
set PHYS_SS10_EEPROM + 0x2E, %g1
lduba [%g1] ASI_M_CTL, %g2
+ stba %g0, [%g2] ASI_M_CTL
set PHYS_SS10_EEPROM + 0x30, %g1
lda [%g1] ASI_M_CTL, %g1
tst %g2
@@ -124,15 +129,18 @@
add %g2, 4, %g2
sta %g0, [%g2] ASI_M_CTL ! clear softints
set PHYS_SS10_EEPROM + 0x3C, %g1
- lda [%g1] ASI_M_CTL, %g1
- set AC_M_CTPR, %g2
- sta %g1, [%g2] ASI_M_MMUREGS ! set ctx table ptr
+ lda [%g1] ASI_M_CTL, %g2
+ sta %g0, [%g1] ASI_M_CTL
+ set AC_M_CTPR, %g1
+ sta %g2, [%g1] ASI_M_MMUREGS ! set ctx table ptr
set PHYS_JJ_EEPROM + 0x40, %g1
- lda [%g1] ASI_M_CTL, %g1
- set AC_M_CXR, %g2
- sta %g1, [%g2] ASI_M_MMUREGS ! set context
+ lda [%g1] ASI_M_CTL, %g2
+ sta %g0, [%g1] ASI_M_CTL
+ set AC_M_CXR, %g1
+ sta %g2, [%g1] ASI_M_MMUREGS ! set context
set PHYS_SS10_EEPROM + 0x38, %g1
lda [%g1] ASI_M_CTL, %g2
+ sta %g0, [%g1] ASI_M_CTL
set 1, %g1
jmp %g2 ! jump to kernel
sta %g1, [%g0] ASI_M_MMUREGS ! enable mmu
Modified: openbios-devel/arch/sparc32/romvec.c
===================================================================
--- openbios-devel/arch/sparc32/romvec.c 2007-05-19 12:55:01 UTC (rev 149)
+++ openbios-devel/arch/sparc32/romvec.c 2007-05-27 19:49:35 UTC (rev 150)
@@ -246,22 +246,31 @@
static void obp_reboot(char *str)
{
+ extern volatile int *reset_reg;
+
printk("rebooting (%s)\n", str);
- outb(1, 0x71f00000);
+ *reset_reg = 1;
+ printk("reboot failed\n");
for (;;) {}
}
static void obp_abort(void)
{
+ extern volatile int *power_reg;
+
printk("abort, power off\n");
- outb(1, 0x71910000);
+ *power_reg = 1;
+ printk("power off failed\n");
for (;;) {}
}
static void obp_halt(void)
{
+ extern volatile int *power_reg;
+
printk("halt, power off\n");
- outb(1, 0x71910000);
+ *power_reg = 1;
+ printk("power off failed\n");
for (;;) {}
}
Modified: openbios-devel/drivers/obio.c
===================================================================
--- openbios-devel/drivers/obio.c 2007-05-19 12:55:01 UTC (rev 149)
+++ openbios-devel/drivers/obio.c 2007-05-27 19:49:35 UTC (rev 150)
@@ -809,13 +809,18 @@
fword("finish-device");
}
+volatile int *power_reg, *reset_reg;
+
static void
ob_power_init(uint64_t base, uint64_t offset, int intr)
{
ob_new_obio_device("power", NULL);
- ob_reg(base, offset, POWER_REGS, 0);
+ power_reg = ob_reg(base, offset, POWER_REGS, 1);
+ // Not in device tree
+ reset_reg = map_io(base + (uint64_t)SLAVIO_RESET, RESET_REGS);
+
ob_intr(intr);
fword("finish-device");
Modified: openbios-devel/drivers/obio.h
===================================================================
--- openbios-devel/drivers/obio.h 2007-05-19 12:55:01 UTC (rev 149)
+++ openbios-devel/drivers/obio.h 2007-05-27 19:49:35 UTC (rev 150)
@@ -29,6 +29,9 @@
#define SLAVIO_INTERRUPT 0x00e00000ULL
#define INTERRUPT_REGS 0x10
+#define SLAVIO_RESET 0x00f00000ULL
+#define RESET_REGS 1
+
#define SLAVIO_SIZE 0x01000000
struct qemu_nvram_v1 {
12 years, 5 months
- 1
- 0
r421 - cpu/x86/pc/olpc
by svn＠openbios.org
Author: wmb
Date: 2007-05-24 04:27:49 +0200 (Thu, 24 May 2007)
New Revision: 421
Modified:
cpu/x86/pc/olpc/versions.fth
Log:
Q2C14
Modified: cpu/x86/pc/olpc/versions.fth
===================================================================
--- cpu/x86/pc/olpc/versions.fth 2007-05-24 02:26:08 UTC (rev 420)
+++ cpu/x86/pc/olpc/versions.fth 2007-05-24 02:27:49 UTC (rev 421)
@@ -2,7 +2,7 @@
\ The overall firmware revision
macro: FW_MAJOR C
-macro: FW_MINOR 13
+macro: FW_MINOR 14
\ The EC microcode
macro: EC_VERSION c13
12 years, 6 months
- 1
- 0
r420 - cpu/x86/pc/olpc dev/usb2/hcd dev/usb2/hcd/ehci
by svn＠openbios.org
Author: wmb
Date: 2007-05-24 04:26:08 +0200 (Thu, 24 May 2007)
New Revision: 420
Modified:
cpu/x86/pc/olpc/usb.fth
dev/usb2/hcd/control.fth
dev/usb2/hcd/ehci/probe.fth
Log:
USB - added a configurable delay to the probe process as a workaround for OLPC trac 1473:
ok setenv usb-delay 3000 \ 3000 milliseconds, i.e. 3 seconds
ok probe-usb
Modified: cpu/x86/pc/olpc/usb.fth
===================================================================
--- cpu/x86/pc/olpc/usb.fth 2007-05-24 02:19:40 UTC (rev 419)
+++ cpu/x86/pc/olpc/usb.fth 2007-05-24 02:26:08 UTC (rev 420)
@@ -1,6 +1,8 @@
purpose: USB elaborations for the OLPC platform
\ See license at end of file
+0 config-int usb-delay \ Milliseconds to wait before set-address
+
devalias usb1 /usb@f,4
devalias usb2 /usb@f,5
devalias u /usb/disk
Modified: dev/usb2/hcd/control.fth
===================================================================
--- dev/usb2/hcd/control.fth 2007-05-24 02:19:40 UTC (rev 419)
+++ dev/usb2/hcd/control.fth 2007-05-24 02:26:08 UTC (rev 420)
@@ -46,6 +46,8 @@
headers
: set-address ( dev -- usberr )
+ " usb-delay" ['] eval catch if 2drop else ms then
+
\ To get the right characteristics for dev in control-set, then normal
\ set-my-dev is nooped. We set my-dev and my-real-dev here instead.
['] set-my-dev behavior swap ( xt dev ) \ Save set-my-dev
Modified: dev/usb2/hcd/ehci/probe.fth
===================================================================
--- dev/usb2/hcd/ehci/probe.fth 2007-05-24 02:19:40 UTC (rev 419)
+++ dev/usb2/hcd/ehci/probe.fth 2007-05-24 02:26:08 UTC (rev 420)
@@ -4,15 +4,6 @@
hex
headers
-: retry-set-address ( dev -- error? )
- d# 200 ms
- d# 5 0 do
- dup set-address 0= if drop false unloop exit then
- d# 1000
- loop
- drop true
-;
-
: make-root-hub-node ( port -- )
ok-to-add-device? 0= if drop exit then \ Can't add another device
@@ -21,9 +12,7 @@
0 set-target ( port dev ) \ Address it as device 0
- dup retry-set-address if 2drop exit then ( port dev ) \ Assign it usb addr dev
-\ d# 4000 ms
-\ dup set-address if 2drop exit then ( port dev ) \ Assign it usb addr dev
+ dup set-address if 2drop exit then ( port dev ) \ Assign it usb addr dev
dup set-target ( port dev ) \ Address it as device dev
make-device-node ( )
12 years, 6 months
- 1
- 0
r419 - cpu/x86/pc/olpc
by svn＠openbios.org
Author: wmb
Date: 2007-05-24 04:19:40 +0200 (Thu, 24 May 2007)
New Revision: 419
Modified:
cpu/x86/pc/olpc/fw.bth
Log:
Freeze the screen upon entry to the kernel for the fast-boot case - OLPC Trac #1328 .
Modified: cpu/x86/pc/olpc/fw.bth
===================================================================
--- cpu/x86/pc/olpc/fw.bth 2007-05-24 02:16:29 UTC (rev 418)
+++ cpu/x86/pc/olpc/fw.bth 2007-05-24 02:19:40 UTC (rev 419)
@@ -516,6 +516,13 @@
" keyboard" open-dev ?dup if set-stdin then
;
+: go-hook-freeze
+ [ ' go-hook behavior compile, ]
+ 0 " set-source" $call-screen
+;
+: freeze ( -- ) ['] go-hook-freeze to go-hook ;
+: unfreeze ( -- ) ['] usb-quiet to go-hook ;
+
: startup ( -- )
standalone? 0= if exit then
@@ -531,6 +538,7 @@
[ifndef] lx-devel
enable-power-button
[then]
+ freeze
auto-boot
screen-ih stdout !
open-keyboard
12 years, 6 months
- 1
- 0
r418 - cpu/x86
by svn＠openbios.org
Author: wmb
Date: 2007-05-24 04:16:29 +0200 (Thu, 24 May 2007)
New Revision: 418
Modified:
cpu/x86/adpcm.fth
Log:
ADPCM decoder - allocate DMA memory for the sound so "boot" doesn't overwrite it.
OLPC trac #1563
Modified: cpu/x86/adpcm.fth
===================================================================
--- cpu/x86/adpcm.fth 2007-05-23 20:56:34 UTC (rev 417)
+++ cpu/x86/adpcm.fth 2007-05-24 02:16:29 UTC (rev 418)
@@ -257,49 +257,58 @@
d# -9 value playback-volume \ -9 is clipping threshold
-: play-pcm ( adr -- error? )
- wav-in-#ch 0= if drop true exit then
- playback-volume set-volume
- set-sample-rate
- wav-data-adr 4 - le-l@ to /pcm-output
- wav-in-#ch #output-ch <> if
- /pcm-output wav-in-#ch / #output-ch * to /pcm-output
- #output-ch wav-in-#ch < if
- dup condense-pcm \ Skip extra channel data
- else
- dup expand-pcm \ Convert mono to stereo
- then
- then
- /pcm-output (play-pcm)
+0 value pcm-base
+
+: play-raw-pcm ( adr -- error? )
+ wav-in-#ch 0= if drop true exit then ( adr )
+
+ \ Allocate DMA memory for the decoded output
+ wav-data-adr 4 - le-l@ ( adr in-len )
+ dup wav-in-#ch / #output-ch * to /pcm-output ( adr in-len )
+ /pcm-output " dma-alloc" $call-audio to pcm-base ( adr in-len )
+
+ pcm-base swap move ( )
+
+ #output-ch wav-in-#ch < if pcm-base condense-pcm then \ Skip extra channel data
+ #output-ch wav-in-#ch > if pcm-base expand-pcm then \ Convert mono to stereo
+
+ pcm-base /pcm-output (play-pcm)
false
;
: play-ima-adpcm ( adr -- error? )
wav-fact-adr 0= if drop true exit then
- playback-volume set-volume
- set-sample-rate
+
wav-#sample #output-ch * /w* to /pcm-output
- \ Because alloc-mem does not guarantee contiguous physical memory, use load-base area.
- loaded + pagesize round-up tuck ( out in out )
+ \ Allocate DMA memory for the decoded output
+ /pcm-output " dma-alloc" $call-audio to pcm-base
- dup /pcm-output erase ( out in out )
- wav-#sample wav-in-#ch wav-blk-size ( out in out #sample #ch blk-size )
- adpcm-decoder ( out )
- #output-ch 2 = wav-in-#ch 1 = and if ( out )
- dup /pcm-output mono16>stereo16 ( out )
- then ( out )
- /pcm-output (play-pcm) ( )
+ pcm-base /pcm-output erase ( in )
+ pcm-base wav-#sample wav-in-#ch wav-blk-size adpcm-decoder ( )
+ #output-ch 2 = wav-in-#ch 1 = and if ( )
+ pcm-base /pcm-output mono16>stereo16 ( )
+ then ( )
+ pcm-base /pcm-output (play-pcm) ( )
false ( error? )
;
: (play-wav) ( adr -- error? )
+ pcm-base if
+ pcm-base /pcm-output " dma-free" $call-audio
+ 0 to pcm-base
+ then
+
parse-wav-ok? not if ." Not a .wav file" cr true exit then
" /audio" open-dev ?dup 0= if ." Cannot open audio device" cr true exit then
to audio-ih
+
+ playback-volume set-volume
+ set-sample-rate
+
wav-cc case
- 1 of wav-data-adr play-pcm endof
- h# 11 of wav-data-adr play-ima-adpcm endof
+ 1 of wav-data-adr play-raw-pcm endof
+ h# 11 of wav-data-adr play-ima-adpcm endof
( default ) ." Cannot play .wav format type: " dup .wav-cc true swap cr
endcase
audio-ih close-dev
12 years, 6 months
- 1
- 0
r417 - dev/olpc/cafenand
by svn＠openbios.org
Author: wmb
Date: 2007-05-23 22:56:34 +0200 (Wed, 23 May 2007)
New Revision: 417
Modified:
dev/olpc/cafenand/selftest.fth
Log:
CaFe NAND selftest - Reinstate fix for selftest failure on ST and Samsung parts,
which was undone by svn 355.
Modified: dev/olpc/cafenand/selftest.fth
===================================================================
--- dev/olpc/cafenand/selftest.fth 2007-05-23 00:13:56 UTC (rev 416)
+++ dev/olpc/cafenand/selftest.fth 2007-05-23 20:56:34 UTC (rev 417)
@@ -182,7 +182,6 @@
: selftest ( -- error? )
open 0= if true exit then
get-msecs rn !
- read-id 1+ c@ h# dc <> if close true exit then
show-bbt cr
(selftest)
close
12 years, 6 months
- 1
- 0
r416 - cpu/x86/pc/olpc
by svn＠openbios.org
Author: wmb
Date: 2007-05-23 02:13:56 +0200 (Wed, 23 May 2007)
New Revision: 416
Modified:
cpu/x86/pc/olpc/resume.bth
Log:
Fixed OLPC trac #1554 by clearing the positive and negative edge event status
bits for GPIO pins that are not powered during suspend.
Modified: cpu/x86/pc/olpc/resume.bth
===================================================================
--- cpu/x86/pc/olpc/resume.bth 2007-05-23 00:07:01 UTC (rev 415)
+++ cpu/x86/pc/olpc/resume.bth 2007-05-23 00:13:56 UTC (rev 416)
@@ -325,8 +325,8 @@
si bx cmp
= until
- h# 1840 # di mov \ PM1_STS/EN I/O port number
- di ax in ax di out \ Preserve EN bits and cleare STS bits
+ h# 1840 # dx mov \ PM1_STS/EN I/O port number
+ dx ax in ax dx out \ Preserve EN bits and clear STS bits
h# 38 [bp] si lea \ Save area
@@ -344,6 +344,12 @@
ax dx out \ Write to GPIO control register
4 # dx sub \ Next port address
loopa
+
+ \ Clear edge detects for GPIO pins that are not powered during suspend
+ h# ffff # ax mov
+ h# 1048 # dx mov ax dx out \ Pos edge status
+ h# 104c # dx mov ax dx out \ Neg edge status
+
ax lods h# 1040 # dx mov ax dx out \ Pos edge enable
ax lods h# 1044 # dx mov ax dx out \ Neg edge enable
ax lods h# 103c # dx mov ax dx out \ Low bank lock
@@ -355,6 +361,13 @@
ax dx out \ Write to GPIO control register
4 # dx sub \ Next port address
loopa
+
+ \ Clear edge detects for GPIO pins that are not powered during suspend
+ \ GPIOs 28:24 are in the suspend power well. GPIOs 31:29 don't exist.
+ h# e0ff # ax mov
+ h# 10c8 # dx mov ax dx out \ Pos edge status
+ h# 10cc # dx mov ax dx out \ Neg edge status
+
ax lods h# 10c0 # dx mov ax dx out \ Pos edge enable
ax lods h# 10c4 # dx mov ax dx out \ Neg edge enable
ax lods h# 10bc # dx mov ax dx out \ High bank lock
12 years, 6 months
- 1
- 0
r415 - dev/geode/ac97
by svn＠openbios.org
Author: wmb
Date: 2007-05-23 02:07:01 +0200 (Wed, 23 May 2007)
New Revision: 415
Modified:
dev/geode/ac97/ac97.fth
Log:
OLPC audio - driver tweaks to deal with the MIC bias being turned off by early startup code.
Modified: dev/geode/ac97/ac97.fth
===================================================================
--- dev/geode/ac97/ac97.fth 2007-05-22 22:53:34 UTC (rev 414)
+++ dev/geode/ac97/ac97.fth 2007-05-23 00:07:01 UTC (rev 415)
@@ -211,17 +211,7 @@
: set-sample-rate ( hz -- ) to sample-rate ;
-: open-in ( -- )
- sample-rate d# 1000 / to s/ms ( hz )
- sample-rate h# 32 codec!
- 0 set-record-gain
- mic+0db
- mic-input
-;
: amp-default-on? ( -- flag ) " gx?" eval ;
-: close-in ( -- )
-\ h# 8000 set-record-gain \ mute
-;
: codec-set ( bitmask reg# -- ) dup >r codec@ or r> codec! ;
: codec-clr ( bitmask reg# -- ) dup >r codec@ swap invert and r> codec! ;
: amplifier-on ( -- )
@@ -240,7 +230,6 @@
: open-out ( -- )
amplifier-on
disable-playback
- h# 010 h# 76 codec! \ Route mixer out to headphones, unlock sample rate
sample-rate d# 1000 / to s/ms
sample-rate h# 2e codec! \ Only need to set surround DAC for OLPC
h# 606 set-pcm-gain \ Basic PCM Gain - -9 dB, just below clipping
@@ -338,12 +327,26 @@
: 48khz ( -- ) d# 48000 set-sample-rate ;
: default ( -- ) 48khz disable-playback ;
+: open-in ( -- )
+ sample-rate d# 1000 / to s/ms ( hz )
+ sample-rate h# 32 codec!
+ 0 set-record-gain
+ vbias-on
+ mic+0db
+ mic-input
+;
+: close-in ( -- )
+\ h# 8000 set-record-gain \ mute
+ vbias-off
+;
+
: open ( -- ok? )
map-regs
codec-ready? 0= if false exit then
get-device-id
fatal-error? if false exit then
default
+ h# 10 h# 76 codec-set \ Unlock sample rate
h# 2801 h# 2a codec-set \ Enable variable rate, power down LFE and center DACs
parse-args 0= if unmap-regs false exit then
true
12 years, 6 months
- 1
- 0
r414 - cpu/x86/pc/olpc
by svn＠openbios.org
Author: wmb
Date: 2007-05-23 00:53:34 +0200 (Wed, 23 May 2007)
New Revision: 414
Modified:
cpu/x86/pc/olpc/rmstart.fth
Log:
OLPC Trac 1476 - turn off the microphone bias very early to eliminate
the MIC LED blink on resume from S3.
Modified: cpu/x86/pc/olpc/rmstart.fth
===================================================================
--- cpu/x86/pc/olpc/rmstart.fth 2007-05-22 22:50:22 UTC (rev 413)
+++ cpu/x86/pc/olpc/rmstart.fth 2007-05-22 22:53:34 UTC (rev 414)
@@ -128,6 +128,31 @@
h# 01 # al mov al h# 80 # out
+ \ The next few MSRs allow us to access the 5536
+ \ EXTMSR - page 449 \ Use PCI device #F for port 2
+
+ op: dx dx xor
+ op: h# f00 # ax mov \ 00000000.00000f00.
+ op: h# 5000201e # cx mov \ MSR number
+ wrmsr
+
+ op: h# 44000020 # dx mov
+ op: h# 00200013 # ax mov \ 44000020.00200013 \ mode C
+ op: h# 51000010 # cx mov \ MSR number - CPU interface serial
+ wrmsr
+
+ op: h# 014fc001 # dx mov
+ op: h# 01480001 # ax mov
+ op: h# 51000026 # cx mov
+ wrmsr
+
+ op: h# a0000001 # dx mov
+ op: h# 480fff80 # ax mov
+ op: h# 510100e1 # cx mov
+ wrmsr
+
+ op: h# 7601.0004 # ax mov op: h# 148c # dx mov op: ax dx out
+
\ This code is highly optimized because it runs when the CPU is in
\ it slowest operation mode, so we want to get it done fast.
\ GLCP_SYS_RSTPLL - page 406
12 years, 6 months
- 1
- 0
r413 - cpu/x86/pc/olpc dev/olpc/spiflash
by svn＠openbios.org
Author: wmb
Date: 2007-05-23 00:50:22 +0200 (Wed, 23 May 2007)
New Revision: 413
Modified:
cpu/x86/pc/olpc/devices.fth
dev/olpc/spiflash/recover.fth
dev/olpc/spiflash/spiui.fth
Log:
Added "recover <device_specifier>" and "clone" commands, for rewriting another
machine's SPI FLASH.
Modified: cpu/x86/pc/olpc/devices.fth
===================================================================
--- cpu/x86/pc/olpc/devices.fth 2007-05-22 01:52:08 UTC (rev 412)
+++ cpu/x86/pc/olpc/devices.fth 2007-05-22 22:50:22 UTC (rev 413)
@@ -285,6 +285,7 @@
fload ${BP}/dev/olpc/spiflash/spiflash.fth \ SPI FLASH programming
fload ${BP}/dev/olpc/spiflash/spiui.fth \ User interface for SPI FLASH programming
+fload ${BP}/dev/olpc/spiflash/recover.fth \ XO-to-XO SPI FLASH recovery
: ofw-fw-filename$ " disk:\boot\olpc.rom" ;
' ofw-fw-filename$ to fw-filename$
Modified: dev/olpc/spiflash/recover.fth
===================================================================
--- dev/olpc/spiflash/recover.fth 2007-05-22 01:52:08 UTC (rev 412)
+++ dev/olpc/spiflash/recover.fth 2007-05-22 22:50:22 UTC (rev 413)
@@ -30,7 +30,6 @@
." Getting a copy of this machine's FLASH" cr
h# fff0.0000 flash-buf /flash move
true to file-loaded?
- flash-buf ec-buf /ec move \ Save a copy for merging
(serial-flash)
;
Modified: dev/olpc/spiflash/spiui.fth
===================================================================
--- dev/olpc/spiflash/spiui.fth 2007-05-22 01:52:08 UTC (rev 412)
+++ dev/olpc/spiflash/spiui.fth 2007-05-22 22:50:22 UTC (rev 413)
@@ -153,6 +153,24 @@
: ?move-mfg-data ( -- )
." Merging existing manufacturing data" cr
+ flash-base -1 = if
+ \ Read the manufacturing data from the other FLASH
+ \ First try the new location in the e.0000 block
+ flash-buf mfg-data-offset + /flash-block mfg-data-offset read-spi-flash
+
+ \ If there is no mfg data in the e.000 block, get whatever is in the
+ \ last 2K of the 0 block, where the mfg data used to live.
+ flash-buf mfg-data-end-offset + invalid-tag? if
+ flash-buf mfg-data-offset + /flash-block h# ff erase
+
+ flash-buf mfg-data-end-offset + h# 800 - h# 800 ( adr len )
+ mfg-data-end-offset h# 800 - ( adr len offset )
+ read-spi-flash ( )
+ then
+ exit
+ then
+
+
\ If the system has mfg data in the old place, move it to the new place
mfg-data-top flash-base h# 1.0000 + = if
\ Copy just the manufacturing data into the memory buffer; don't
12 years, 6 months
- 1
- 0