GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add make_idb.py & update bootblock 

BUG=chrome-os-partner:29778
TEST=Build coreboot

Change-Id: Ica7b2bf2cf649c2731933ce59a263692bb2c0282
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: ba9c36daedc749748f45e68a84f8c34c636adb1c
Original-Change-Id: Ia0e4e39d4391674f25e630b40913eb99ff3f75c4
Original-Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Original-Signed-off-by: huang lin <hl@rock-chips.com>
Original-Reviewed-on: https://chromium-review.googlesource.com/209427
Original-Reviewed-by: David Hendricks <dhendrix@chromium.org>
Original-Commit-Queue: Julius Werner <jwerner@chromium.org>
Reviewed-on: http://review.coreboot.org/8862
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
This commit is contained in:
huang lin 2014-08-26 17:31:28 +08:00 committed by Patrick Georgi
parent 7333e1fbc3
commit 817e455d38
6 changed files with 175 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mainboard/google/veyron/Kconfig
View File

@ -44,6 +44,10 @@ config EC_GOOGLE_CHROMEEC_SPI_BUS
hex
default 1
config BOOT_MEDIA_SPI_BUS
int
default 2
config DRAM_DMA_START
hex
default 0x10000000

4
src/soc/rockchip/rk3288/Kconfig
View File

@ -54,6 +54,10 @@ config BOOTBLOCK_CPU_INIT
# 0xFF71_3000 CBFS mapping cache (20K)
# 0xFF71_7FFF End of iRAM.
config SYS_SRAM_BASE
hex "SRAM base address"
default 0xFF700000
config SYS_SDRAM_BASE
hex "SDRAM base address"
default 0x00000000

10
src/soc/rockchip/rk3288/Makefile.inc
View File

@ -17,6 +17,8 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
IDBTOOL = util/rockchip/make_idb.py
#bootblock-y += bootblock.c
bootblock-y += cbmem.c
bootblock-y += timer.c
@ -43,3 +45,11 @@ ramstage-y += clock.c
ramstage-y += spi.c
ramstage-y += media.c
ramstage-$(CONFIG_DRIVERS_UART) += uart.c
$(objcbfs)/bootblock.raw.elf: $(objcbfs)/bootblock.elf
cp $< $@
$(objcbfs)/bootblock.bin: $(objcbfs)/bootblock.raw.bin
@printf "Generating: $(subst $(obj)/,,$(@))\n"
@mkdir -p $(dir $@)
@$(IDBTOOL) --from=$< --to=$@ --enable-align

8
src/soc/rockchip/rk3288/bootblock.c
View File

@ -19,12 +19,20 @@
#include <console/console.h>
#include <arch/cache.h>
#include <arch/io.h>
#include <bootblock_common.h>
#include "timer.h"
#include "clock.h"
#include "grf.h"
#include "spi.h"
static void bootblock_cpu_init(void)
{
writel(IOMUX_UART2, &rk3288_grf->iomux_uart2);
writel(IOMUX_SPI2_CSCLK, &rk3288_grf->iomux_spi2csclk);
writel(IOMUX_SPI2_TXRX, &rk3288_grf->iomux_spi2txrx);
rk3288_init_timer();
console_init();
rkclk_init();
rockchip_spi_init(CONFIG_BOOT_MEDIA_SPI_BUS);
}

25
util/rockchip/LICENSE Normal file
View File

@ -0,0 +1,25 @@
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following disclaimer
// in the documentation and/or other materials provided with the
// distribution.
// * Neither the name of Google Inc. nor the names of its
// contributors may be used to endorse or promote products derived from
// this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

124
util/rockchip/make_idb.py Executable file
View File

@ -0,0 +1,124 @@
#!/usr/bin/env python
# Copyright (c) 2014 Google Inc. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import struct
import sys
from io import SEEK_SET, SEEK_END
class IDBTool:
def __init__(self):
print "Initialize IDBTool"
def p_rc4(self, buf, length):
key = (124,78,3,4,85,5,9,7,45,44,123,56,23,13,23,17)
K = key * 16
S = [i for i in range(256)]
j = 0
for i in range(256):
j = (j + S[i] + K[i]) % 256
temp = S[i]; S[i] = S[j]; S[j] = temp;
i = j = k = 0
for x in range(length):
i = (i+1) % 256
j = (j + S[i]) % 256
temp = S[i]; S[i] = S[j]; S[j] = temp
k = (S[i] + S[j]) % 256
buf[x] = struct.pack('B', ord(buf[x]) ^ S[k])
def makeIDB(self, from_file, to_file, rc4_flag = False, align_flag = False):
try:
fin = open(from_file, 'rb')
except:
sys.exit("Failed to open file : " + from_file)
try:
fin.seek(0, SEEK_END)
if (fin.tell() > 4 * 1024 * 1024):
sys.exit("Input file is more than 4MB")
fin.seek(0)
data = fin.read()
finally:
fin.close()
data_len = len(data)
SECTOR_SIZE = 512
PAGE_ALIGN = 4
sectors = (data_len + 4 - 1) / SECTOR_SIZE + 1
pages = (sectors - 1) / PAGE_ALIGN + 1
sectors = pages * PAGE_ALIGN;
buf = [B'\0'] * sectors * SECTOR_SIZE
buf[:4] = "RK32"
buf[4 : 4+data_len] = data
idblock = [B'\0'] * 4 * SECTOR_SIZE
blank = [B'\0'] * 4 * SECTOR_SIZE
idblock[:4] = ['\x55', '\xAA', '\xF0', '\x0F']
if (not rc4_flag):
idblock[8:12] = struct.pack("<I", 1)
else:
for i in range(sectors):
list_tmp = buf[SECTOR_SIZE*i : SECTOR_SIZE*(i+1)]
self.p_rc4(list_tmp, SECTOR_SIZE)
buf[SECTOR_SIZE*i : SECTOR_SIZE*(i+1)] = list_tmp
idblock[12:16] = struct.pack("<HH", 4, 4);
idblock[506:510] = struct.pack("<HH", sectors, sectors);
self.p_rc4(idblock, SECTOR_SIZE)
try:
fout = open(to_file, "wb+")
except:
sys.exit("Failed to open output file : " + to_file)
try:
if (align_flag):
fout.write(''.join(idblock))
fout.write(''.join(blank))
for s in xrange(0, sectors * SECTOR_SIZE, PAGE_ALIGN * SECTOR_SIZE):
fout.write(''.join(buf[s : s + PAGE_ALIGN * SECTOR_SIZE]))
fout.write(''.join(blank))
else:
fout.write(''.join(idblock))
fout.write(''.join(buf))
fout.flush()
except:
sys.exit("Failed to write data to : " + to_file)
finally:
fout.close()
print "DONE"
def usage():
print "Usage: make_idb.py [--enable-rc4] [--enable-align] [--to=out] --from=in"
if __name__ == '__main__':
rc4_flag = align_flag = False
to_file = "IDBlock.bin"
for para in sys.argv[1:]:
if (para == "--enable-rc4"):
rc4_flag = True
elif (para == "--enable-align"):
align_flag = True
elif (para.startswith("--to=")):
to_file = para.split('=')[1]
elif (para.startswith("--from=")):
from_file = para.split('=')[1]
elif (para == "--help" or para == "-h"):
usage()
sys.exit()
else:
usage()
sys.exit()
if ('from_file' not in vars() or to_file == ''):
usage()
sys.exit()
idbtool = IDBTool()
idbtool.makeIDB(from_file, to_file, rc4_flag, align_flag)