Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts: MAINTAINERS boards.cfg Signed-off-by: Stefano Babic <sbabic@denx.de>
This commit is contained in:
Stefano Babic
commit
c4a7ece020
1415
MAINTAINERS
1415
MAINTAINERS
File diff suppressed because it is too large
Load Diff
51
MAKEALL
51
MAKEALL
|
|
@ -106,9 +106,9 @@ while true ; do
|
|||
-s|--soc)
|
||||
# echo "Option SoC: argument \`$2'"
|
||||
if [ "$opt_s" ] ; then
|
||||
opt_s="${opt_s%)} || \$6 == \"$2\" || \$6 ~ /$2/)"
|
||||
opt_s="${opt_s%)} || \$4 == \"$2\" || \$4 ~ /$2/)"
|
||||
else
|
||||
opt_s="(\$6 == \"$2\" || \$6 ~ /$2/)"
|
||||
opt_s="(\$4 == \"$2\" || \$4 ~ /$2/)"
|
||||
fi
|
||||
SELECTED='y'
|
||||
shift 2 ;;
|
||||
|
|
@ -160,7 +160,7 @@ FILTER="\$1 !~ /^#/"
|
|||
[ "$opt_v" ] && FILTER="${FILTER} && $opt_v"
|
||||
|
||||
if [ "$SELECTED" ] ; then
|
||||
SELECTED=$(awk '('"$FILTER"') { print $1 }' boards.cfg)
|
||||
SELECTED=$(awk '('"$FILTER"') { print $7 }' boards.cfg)
|
||||
|
||||
# Make sure some boards from boards.cfg are actually found
|
||||
if [ -z "$SELECTED" ] ; then
|
||||
|
|
@ -232,12 +232,12 @@ boards_by_field()
|
|||
-v field="$1" \
|
||||
-v select="$2" \
|
||||
-F "$FS" \
|
||||
'($1 !~ /^#/ && $field == select) { print $1 }' \
|
||||
'($1 !~ /^#/ && $field == select) { print $7 }' \
|
||||
boards.cfg
|
||||
}
|
||||
boards_by_arch() { boards_by_field 2 "$@" ; }
|
||||
boards_by_cpu() { boards_by_field 3 "$@" "[: \t]+" ; }
|
||||
boards_by_soc() { boards_by_field 6 "$@" ; }
|
||||
boards_by_soc() { boards_by_field 4 "$@" ; }
|
||||
|
||||
#########################################################################
|
||||
## MPC5xx Systems
|
||||
|
|
@ -519,56 +519,53 @@ get_target_location() {
|
|||
local vendor=""
|
||||
|
||||
# Automatic mode
|
||||
local line=`egrep -i "^[[:space:]]*${target}[[:space:]]" boards.cfg`
|
||||
|
||||
local line=`awk -F '\ +' '\$7 == "'"$target"'" { print \$0 }' boards.cfg`
|
||||
if [ -z "${line}" ] ; then echo "" ; return ; fi
|
||||
|
||||
set ${line}
|
||||
|
||||
# add default board name if needed
|
||||
[ $# = 3 ] && set ${line} ${1}
|
||||
CONFIG_NAME="${7%_config}"
|
||||
|
||||
CONFIG_NAME="${1%_config}"
|
||||
[ "${BOARD_NAME}" ] || BOARD_NAME="${7%_config}"
|
||||
|
||||
[ "${BOARD_NAME}" ] || BOARD_NAME="${1%_config}"
|
||||
|
||||
if [ "$4" = "-" ] ; then
|
||||
board=${BOARD_NAME}
|
||||
else
|
||||
board="$4"
|
||||
if [ $# -gt 5 ]; then
|
||||
if [ "$6" = "-" ] ; then
|
||||
board=${BOARD_NAME}
|
||||
else
|
||||
board="$6"
|
||||
fi
|
||||
fi
|
||||
|
||||
[ $# -gt 4 ] && [ "$5" != "-" ] && vendor="$5"
|
||||
[ $# -gt 6 ] && [ "$7" != "-" ] && {
|
||||
tmp="${7%:*}"
|
||||
[ $# -gt 6 ] && [ "$8" != "-" ] && {
|
||||
tmp="${8%:*}"
|
||||
if [ "$tmp" ] ; then
|
||||
CONFIG_NAME="$tmp"
|
||||
fi
|
||||
}
|
||||
|
||||
# Assign board directory to BOARDIR variable
|
||||
if [ -z "${vendor}" ] ; then
|
||||
if [ "${vendor}" == "-" ] ; then
|
||||
BOARDDIR=${board}
|
||||
else
|
||||
BOARDDIR=${vendor}/${board}
|
||||
fi
|
||||
|
||||
echo "${CONFIG_NAME}:${BOARDDIR}"
|
||||
echo "${CONFIG_NAME}:${BOARDDIR}:${BOARD_NAME}"
|
||||
}
|
||||
|
||||
get_target_maintainers() {
|
||||
local name=`echo $1 | cut -d : -f 1`
|
||||
local name=`echo $1 | cut -d : -f 3`
|
||||
|
||||
if ! grep -qsi "[[:blank:]]${name}[[:blank:]]" MAINTAINERS ; then
|
||||
local line=`awk -F '\ +' '\$7 == "'"$target"'" { print \$0 }' boards.cfg`
|
||||
if [ -z "${line}" ]; then
|
||||
echo ""
|
||||
return ;
|
||||
fi
|
||||
|
||||
local line=`tac MAINTAINERS | grep -ni "[[:blank:]]${name}[[:blank:]]" | cut -d : -f 1`
|
||||
local mail=`tac MAINTAINERS | tail -n +${line} | \
|
||||
sed -n ":start /.*@.*/ { b mail } ; n ; b start ; :mail /.*@.*/ { p ; n ; b mail } ; q" | \
|
||||
sed "s/^.*<//;s/>.*$//"`
|
||||
echo "$mail"
|
||||
local mails=`echo ${line} | cut -d ' ' -f 9- | sed -e 's/[^<]*<//' -e 's/>.*</ /' -e 's/>[^>]*$//'`
|
||||
[ "$mails" == "-" ] && mails=""
|
||||
echo "$mails"
|
||||
}
|
||||
|
||||
get_target_arch() {
|
||||
|
|
|
|||
5
Makefile
5
Makefile
|
|
@ -398,6 +398,7 @@ ALL-y += $(obj)u-boot.srec $(obj)u-boot.bin $(obj)System.map
|
|||
ALL-$(CONFIG_NAND_U_BOOT) += $(obj)u-boot-nand.bin
|
||||
ALL-$(CONFIG_ONENAND_U_BOOT) += $(obj)u-boot-onenand.bin
|
||||
ALL-$(CONFIG_SPL) += $(obj)spl/u-boot-spl.bin
|
||||
ALL-$(CONFIG_SPL_FRAMEWORK) += $(obj)u-boot.img
|
||||
ALL-$(CONFIG_TPL) += $(obj)tpl/u-boot-tpl.bin
|
||||
ALL-$(CONFIG_OF_SEPARATE) += $(obj)u-boot.dtb $(obj)u-boot-dtb.bin
|
||||
ifneq ($(CONFIG_SPL_TARGET),)
|
||||
|
|
@ -837,7 +838,7 @@ unconfig:
|
|||
|
||||
sinclude $(obj).boards.depend
|
||||
$(obj).boards.depend: boards.cfg
|
||||
@awk '(NF && $$1 !~ /^#/) { print $$1 ": " $$1 "_config; $$(MAKE)" }' $< > $@
|
||||
@awk '(NF && $$1 !~ /^#/) { print $$7 ": " $$7 "_config; $$(MAKE) -d" }' $< > $@
|
||||
|
||||
#
|
||||
# Functions to generate common board directory names
|
||||
|
|
@ -866,7 +867,7 @@ clean:
|
|||
$(obj)tools/gdb/{astest,gdbcont,gdbsend} \
|
||||
$(obj)tools/gen_eth_addr $(obj)tools/img2srec \
|
||||
$(obj)tools/mk{env,}image $(obj)tools/mpc86x_clk \
|
||||
$(obj)tools/mk{smdk5250,}spl \
|
||||
$(obj)tools/mk{$(BOARD),}spl \
|
||||
$(obj)tools/mxsboot \
|
||||
$(obj)tools/ncb $(obj)tools/ubsha1 \
|
||||
$(obj)tools/kernel-doc/docproc \
|
||||
|
|
|
|||
15
README
15
README
|
|
@ -35,7 +35,7 @@ Makefile have been tested to some extent and can be considered
|
|||
"working". In fact, many of them are used in production systems.
|
||||
|
||||
In case of problems see the CHANGELOG and CREDITS files to find out
|
||||
who contributed the specific port. The MAINTAINERS file lists board
|
||||
who contributed the specific port. The boards.cfg file lists board
|
||||
maintainers.
|
||||
|
||||
Note: There is no CHANGELOG file in the actual U-Boot source tree;
|
||||
|
|
@ -1680,6 +1680,10 @@ CBFS (Coreboot Filesystem) support
|
|||
to compress the specified memory at its best effort.
|
||||
|
||||
- Compression support:
|
||||
CONFIG_GZIP
|
||||
|
||||
Enabled by default to support gzip compressed images.
|
||||
|
||||
CONFIG_BZIP2
|
||||
|
||||
If this option is set, support for bzip2 compressed
|
||||
|
|
@ -1713,6 +1717,11 @@ CBFS (Coreboot Filesystem) support
|
|||
then calculate the amount of needed dynamic memory (ensuring
|
||||
the appropriate CONFIG_SYS_MALLOC_LEN value).
|
||||
|
||||
CONFIG_LZO
|
||||
|
||||
If this option is set, support for LZO compressed images
|
||||
is included.
|
||||
|
||||
- MII/PHY support:
|
||||
CONFIG_PHY_ADDR
|
||||
|
||||
|
|
@ -5824,8 +5833,8 @@ it:
|
|||
|
||||
* For major contributions, your entry to the CREDITS file
|
||||
|
||||
* When you add support for a new board, don't forget to add this
|
||||
board to the MAINTAINERS file, too.
|
||||
* When you add support for a new board, don't forget to add a
|
||||
maintainer e-mail address to the boards.cfg file, too.
|
||||
|
||||
* If your patch adds new configuration options, don't forget to
|
||||
document these in the README file.
|
||||
|
|
|
|||
|
|
@ -290,10 +290,19 @@ static inline unsigned int s5p_gpio_part_max(int nr)
|
|||
return EXYNOS5_GPIO_PART2_MAX;
|
||||
|
||||
} else if (cpu_is_exynos4()) {
|
||||
if (nr < EXYNOS4_GPIO_PART1_MAX)
|
||||
return 0;
|
||||
else
|
||||
return EXYNOS4_GPIO_PART1_MAX;
|
||||
if (proid_is_exynos4412()) {
|
||||
if (nr < EXYNOS4X12_GPIO_PART1_MAX)
|
||||
return 0;
|
||||
else if (nr < EXYNOS4X12_GPIO_PART2_MAX)
|
||||
return EXYNOS4X12_GPIO_PART1_MAX;
|
||||
else
|
||||
return EXYNOS4X12_GPIO_PART2_MAX;
|
||||
} else {
|
||||
if (nr < EXYNOS4_GPIO_PART1_MAX)
|
||||
return 0;
|
||||
else
|
||||
return EXYNOS4_GPIO_PART1_MAX;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -8,6 +8,8 @@
|
|||
#ifndef __ASM_ARCH_MMC_H_
|
||||
#define __ASM_ARCH_MMC_H_
|
||||
|
||||
#define S5P_MMC_DEV_OFFSET 0x10000
|
||||
|
||||
#define SDHCI_CONTROL2 0x80
|
||||
#define SDHCI_CONTROL3 0x84
|
||||
#define SDHCI_CONTROL4 0x8C
|
||||
|
|
@ -55,7 +57,9 @@ int s5p_sdhci_init(u32 regbase, int index, int bus_width);
|
|||
|
||||
static inline unsigned int s5p_mmc_init(int index, int bus_width)
|
||||
{
|
||||
unsigned int base = samsung_get_base_mmc() + (0x10000 * index);
|
||||
unsigned int base = samsung_get_base_mmc() +
|
||||
(S5P_MMC_DEV_OFFSET * index);
|
||||
|
||||
return s5p_sdhci_init(base, index, bus_width);
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -8,6 +8,8 @@
|
|||
#ifndef __ASM_ARCH_MMC_H_
|
||||
#define __ASM_ARCH_MMC_H_
|
||||
|
||||
#define S5P_MMC_DEV_OFFSET 0x100000
|
||||
|
||||
#define SDHCI_CONTROL2 0x80
|
||||
#define SDHCI_CONTROL3 0x84
|
||||
#define SDHCI_CONTROL4 0x8C
|
||||
|
|
@ -55,7 +57,9 @@ int s5p_sdhci_init(u32 regbase, int index, int bus_width);
|
|||
|
||||
static inline unsigned int s5p_mmc_init(int index, int bus_width)
|
||||
{
|
||||
unsigned int base = samsung_get_base_mmc() + (0x10000 * index);
|
||||
unsigned int base = samsung_get_base_mmc() +
|
||||
(S5P_MMC_DEV_OFFSET * index);
|
||||
|
||||
return s5p_sdhci_init(base, index, bus_width);
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
2005 Free Software Foundation, Inc.
|
||||
|
||||
* SPDX-License-Identifier: GPL-2.0+
|
||||
*/
|
||||
|
||||
/* You have to define the following before including this file:
|
||||
|
||||
|
|
|
|||
|
|
@ -399,7 +399,8 @@ int get_clocks (void)
|
|||
* AN2919.
|
||||
*/
|
||||
#if defined(CONFIG_MPC8540) || defined(CONFIG_MPC8541) || \
|
||||
defined(CONFIG_MPC8560) || defined(CONFIG_MPC8555)
|
||||
defined(CONFIG_MPC8560) || defined(CONFIG_MPC8555) || \
|
||||
defined(CONFIG_P1022)
|
||||
gd->arch.i2c1_clk = sys_info.freq_systembus;
|
||||
#elif defined(CONFIG_MPC8544)
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -44,6 +44,11 @@ SECTIONS
|
|||
}
|
||||
_edata = .;
|
||||
|
||||
. = ALIGN(4);
|
||||
.u_boot_list : {
|
||||
KEEP(*(SORT(.u_boot_list*)));
|
||||
}
|
||||
|
||||
. = .;
|
||||
__start___ex_table = .;
|
||||
__ex_table : { *(__ex_table) }
|
||||
|
|
|
|||
|
|
@ -7,8 +7,6 @@
|
|||
# (mem base + reserved)
|
||||
#
|
||||
|
||||
#Provide at least 16MB spacing between us and the Linux Kernel image
|
||||
CONFIG_SPL_PAD_TO := 12320
|
||||
UBL_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/ublimage.cfg
|
||||
ifndef CONFIG_SPL_BUILD
|
||||
ALL-y += $(obj)u-boot.ubl
|
||||
|
|
|
|||
|
|
@ -102,7 +102,11 @@ void board_init_r(gd_t *gd, ulong dest_addr)
|
|||
env_relocate();
|
||||
#endif
|
||||
|
||||
i2c_init(CONFIG_SYS_FSL_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
|
||||
#ifdef CONFIG_SYS_I2C
|
||||
i2c_init_all();
|
||||
#else
|
||||
i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
|
||||
#endif
|
||||
|
||||
gd->ram_size = initdram(0);
|
||||
#ifdef CONFIG_SPL_NAND_BOOT
|
||||
|
|
|
|||
|
|
@ -527,6 +527,9 @@ void spl_board_init(void)
|
|||
*/
|
||||
board_early_init_f();
|
||||
|
||||
/* enable the LSB transmitter */
|
||||
gpio_write_bit(CONFIG_SYS_GPIO_LSB_ENABLE, 1);
|
||||
|
||||
/*
|
||||
* Clear resets
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -0,0 +1,34 @@
|
|||
#
|
||||
# Copyright (C) 2013 Samsung Electronics
|
||||
#
|
||||
# SPDX-License-Identifier: GPL-2.0+
|
||||
#
|
||||
|
||||
include $(TOPDIR)/config.mk
|
||||
|
||||
LIB = $(obj)lib$(BOARD).o
|
||||
|
||||
COBJS += arndale_spl.o
|
||||
|
||||
ifndef CONFIG_SPL_BUILD
|
||||
COBJS += arndale.o
|
||||
endif
|
||||
|
||||
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
|
||||
OBJS := $(addprefix $(obj),$(COBJS) $(SOBJS))
|
||||
|
||||
ALL := $(obj).depend $(LIB)
|
||||
|
||||
all: $(ALL)
|
||||
|
||||
$(LIB): $(OBJS)
|
||||
$(call cmd_link_o_target, $(OBJS))
|
||||
|
||||
#########################################################################
|
||||
|
||||
# defines $(obj).depend target
|
||||
include $(SRCTREE)/rules.mk
|
||||
|
||||
sinclude $(obj).depend
|
||||
|
||||
#########################################################################
|
||||
|
|
@ -0,0 +1,101 @@
|
|||
/*
|
||||
* Copyright (C) 2013 Samsung Electronics
|
||||
*
|
||||
* SPDX-License-Identifier: GPL-2.0+
|
||||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <asm/arch/pinmux.h>
|
||||
#include <asm/arch/dwmmc.h>
|
||||
#include <asm/arch/power.h>
|
||||
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
|
||||
int board_init(void)
|
||||
{
|
||||
gd->bd->bi_boot_params = (PHYS_SDRAM_1 + 0x100UL);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int dram_init(void)
|
||||
{
|
||||
int i;
|
||||
u32 addr;
|
||||
|
||||
for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) {
|
||||
addr = CONFIG_SYS_SDRAM_BASE + (i * SDRAM_BANK_SIZE);
|
||||
gd->ram_size += get_ram_size((long *)addr, SDRAM_BANK_SIZE);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
int power_init_board(void)
|
||||
{
|
||||
set_ps_hold_ctrl();
|
||||
return 0;
|
||||
}
|
||||
|
||||
void dram_init_banksize(void)
|
||||
{
|
||||
int i;
|
||||
u32 addr, size;
|
||||
|
||||
for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) {
|
||||
addr = CONFIG_SYS_SDRAM_BASE + (i * SDRAM_BANK_SIZE);
|
||||
size = get_ram_size((long *)addr, SDRAM_BANK_SIZE);
|
||||
|
||||
gd->bd->bi_dram[i].start = addr;
|
||||
gd->bd->bi_dram[i].size = size;
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef CONFIG_GENERIC_MMC
|
||||
int board_mmc_init(bd_t *bis)
|
||||
{
|
||||
int ret;
|
||||
/* dwmmc initializattion for available channels */
|
||||
ret = exynos_dwmmc_init(gd->fdt_blob);
|
||||
if (ret)
|
||||
debug("dwmmc init failed\n");
|
||||
|
||||
return ret;
|
||||
}
|
||||
#endif
|
||||
|
||||
static int board_uart_init(void)
|
||||
{
|
||||
int err = 0, uart_id;
|
||||
|
||||
for (uart_id = PERIPH_ID_UART0; uart_id <= PERIPH_ID_UART3; uart_id++) {
|
||||
err = exynos_pinmux_config(uart_id, PINMUX_FLAG_NONE);
|
||||
if (err) {
|
||||
debug("UART%d not configured\n",
|
||||
(uart_id - PERIPH_ID_UART0));
|
||||
return err;
|
||||
}
|
||||
}
|
||||
return err;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_BOARD_EARLY_INIT_F
|
||||
int board_early_init_f(void)
|
||||
{
|
||||
int err;
|
||||
|
||||
err = board_uart_init();
|
||||
if (err) {
|
||||
debug("UART init failed\n");
|
||||
return err;
|
||||
}
|
||||
return err;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_DISPLAY_BOARDINFO
|
||||
int checkboard(void)
|
||||
{
|
||||
printf("\nBoard: Arndale\n");
|
||||
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
|
@ -0,0 +1,50 @@
|
|||
/*
|
||||
* Copyright (c) 2012 The Chromium OS Authors.
|
||||
*
|
||||
* SPDX-License-Identifier: GPL-2.0+
|
||||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <asm/arch/spl.h>
|
||||
|
||||
#define SIGNATURE 0xdeadbeef
|
||||
|
||||
/* Parameters of early board initialization in SPL */
|
||||
static struct spl_machine_param machine_param
|
||||
__attribute__((section(".machine_param"))) = {
|
||||
.signature = SIGNATURE,
|
||||
.version = 1,
|
||||
.params = "vmubfasirM",
|
||||
.size = sizeof(machine_param),
|
||||
|
||||
.mem_iv_size = 0x1f,
|
||||
.mem_type = DDR_MODE_DDR3,
|
||||
|
||||
/*
|
||||
* Set uboot_size to 0x100000 bytes.
|
||||
*
|
||||
* This is an overly conservative value chosen to accommodate all
|
||||
* possible U-Boot image. You are advised to set this value to a
|
||||
* smaller realistic size via scripts that modifies the .machine_param
|
||||
* section of output U-Boot image.
|
||||
*/
|
||||
.uboot_size = 0x100000,
|
||||
|
||||
.boot_source = BOOT_MODE_OM,
|
||||
.frequency_mhz = 800,
|
||||
.arm_freq_mhz = 1000,
|
||||
.serial_base = 0x12c30000,
|
||||
.i2c_base = 0x12c60000,
|
||||
.mem_manuf = MEM_MANUF_SAMSUNG,
|
||||
};
|
||||
|
||||
struct spl_machine_param *spl_get_machine_params(void)
|
||||
{
|
||||
if (machine_param.signature != SIGNATURE) {
|
||||
/* Will hang if SIGNATURE dont match */
|
||||
while (1)
|
||||
;
|
||||
}
|
||||
|
||||
return &machine_param;
|
||||
}
|
||||
|
|
@ -0,0 +1,39 @@
|
|||
/*
|
||||
* SAMSUNG Arndale board device tree source
|
||||
*
|
||||
* Copyright (c) 2013 Samsung Electronics Co., Ltd.
|
||||
* http://www.samsung.com
|
||||
*
|
||||
* SPDX-License-Identifier: GPL-2.0+
|
||||
*/
|
||||
|
||||
/dts-v1/;
|
||||
#include "exynos5250.dtsi"
|
||||
|
||||
/ {
|
||||
model = "SAMSUNG Arndale board based on EXYNOS5250";
|
||||
compatible = "samsung,arndale", "samsung,exynos5250";
|
||||
|
||||
aliases {
|
||||
serial0 = "/serial@12C20000";
|
||||
console = "/serial@12C20000";
|
||||
};
|
||||
|
||||
mmc@12200000 {
|
||||
samsung,bus-width = <8>;
|
||||
samsung,timing = <1 3 3>;
|
||||
};
|
||||
|
||||
mmc@12210000 {
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
mmc@12220000 {
|
||||
samsung,bus-width = <4>;
|
||||
samsung,timing = <1 2 3>;
|
||||
};
|
||||
|
||||
mmc@12230000 {
|
||||
status = "disabled";
|
||||
};
|
||||
};
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
#
|
||||
# Copyright (C) 2010 Samsung Electronics
|
||||
# Kyungmin Park <kyungmin.park@samsung.com>
|
||||
#
|
||||
# SPDX-License-Identifier: GPL-2.0+
|
||||
#
|
||||
|
||||
# On S5PC100 we use the 128 MiB OneDRAM bank at
|
||||
#
|
||||
# 0x30000000 to 0x35000000 (80MiB)
|
||||
# 0x38000000 to 0x40000000 (128MiB)
|
||||
#
|
||||
# On S5PC110 we use the 128 MiB OneDRAM bank at
|
||||
#
|
||||
# 0x30000000 to 0x35000000 (80MiB)
|
||||
# 0x40000000 to 0x50000000 (256MiB)
|
||||
#
|
||||
CONFIG_SYS_TEXT_BASE = 0x34800000
|
||||
|
|
@ -72,7 +72,7 @@ int checkboard(void)
|
|||
#ifdef CONFIG_GENERIC_MMC
|
||||
int board_mmc_init(bd_t *bis)
|
||||
{
|
||||
int i;
|
||||
int i, ret, ret_sd = 0;
|
||||
|
||||
/* MASSMEMORY_EN: XMSMDATA7: GPJ2[7] output high */
|
||||
s5p_gpio_direction_output(&s5pc110_gpio->j2, 7, 1);
|
||||
|
|
@ -95,7 +95,36 @@ int board_mmc_init(bd_t *bis)
|
|||
s5p_gpio_set_drv(&s5pc110_gpio->g0, i, GPIO_DRV_4X);
|
||||
}
|
||||
|
||||
return s5p_mmc_init(0, 4);
|
||||
ret = s5p_mmc_init(0, 4);
|
||||
if (ret)
|
||||
error("MMC: Failed to init MMC:0.\n");
|
||||
|
||||
/*
|
||||
* SD card (T_FLASH) detect and init
|
||||
* T_FLASH_DETECT: EINT28: GPH3[4] input mode
|
||||
*/
|
||||
s5p_gpio_cfg_pin(&s5pc110_gpio->h3, 4, GPIO_INPUT);
|
||||
s5p_gpio_set_pull(&s5pc110_gpio->h3, 4, GPIO_PULL_UP);
|
||||
|
||||
if (!s5p_gpio_get_value(&s5pc110_gpio->h3, 4)) {
|
||||
for (i = 0; i < 7; i++) {
|
||||
if (i == 2)
|
||||
continue;
|
||||
|
||||
/* GPG2[0:6] special function 2 */
|
||||
s5p_gpio_cfg_pin(&s5pc110_gpio->g2, i, 0x2);
|
||||
/* GPG2[0:6] pull disable */
|
||||
s5p_gpio_set_pull(&s5pc110_gpio->g2, i, GPIO_PULL_NONE);
|
||||
/* GPG2[0:6] drv 4x */
|
||||
s5p_gpio_set_drv(&s5pc110_gpio->g2, i, GPIO_DRV_4X);
|
||||
}
|
||||
|
||||
ret_sd = s5p_mmc_init(2, 4);
|
||||
if (ret_sd)
|
||||
error("MMC: Failed to init SD card (MMC:2).\n");
|
||||
}
|
||||
|
||||
return ret & ret_sd;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -1,16 +0,0 @@
|
|||
#
|
||||
# Copyright (C) 2008 # Samsung Elecgtronics
|
||||
# Kyungmin Park <kyungmin.park@samsung.com>
|
||||
#
|
||||
|
||||
# On S5PC100 we use the 128 MiB OneDRAM bank at
|
||||
#
|
||||
# 0x30000000 to 0x35000000 (80MiB)
|
||||
# 0x38000000 to 0x40000000 (128MiB)
|
||||
#
|
||||
# On S5PC110 we use the 128 MiB OneDRAM bank at
|
||||
#
|
||||
# 0x30000000 to 0x35000000 (80MiB)
|
||||
# 0x40000000 to 0x48000000 (128MiB)
|
||||
#
|
||||
CONFIG_SYS_TEXT_BASE = 0x34800000
|
||||
2350
boards.cfg
2350
boards.cfg
File diff suppressed because it is too large
Load Diff
|
|
@ -368,7 +368,7 @@ static int bootm_load_os(bootm_headers_t *images, unsigned long *load_end,
|
|||
|
||||
const char *type_name = genimg_get_type_name(os.type);
|
||||
|
||||
load_buf = map_sysmem(load, image_len);
|
||||
load_buf = map_sysmem(load, unc_len);
|
||||
image_buf = map_sysmem(image_start, image_len);
|
||||
switch (comp) {
|
||||
case IH_COMP_NONE:
|
||||
|
|
@ -436,11 +436,12 @@ static int bootm_load_os(bootm_headers_t *images, unsigned long *load_end,
|
|||
}
|
||||
#endif /* CONFIG_LZMA */
|
||||
#ifdef CONFIG_LZO
|
||||
case IH_COMP_LZO:
|
||||
case IH_COMP_LZO: {
|
||||
size_t size;
|
||||
|
||||
printf(" Uncompressing %s ... ", type_name);
|
||||
|
||||
ret = lzop_decompress(image_buf, image_len, load_buf,
|
||||
&unc_len);
|
||||
ret = lzop_decompress(image_buf, image_len, load_buf, &size);
|
||||
if (ret != LZO_E_OK) {
|
||||
printf("LZO: uncompress or overwrite error %d "
|
||||
"- must RESET board to recover\n", ret);
|
||||
|
|
@ -449,8 +450,9 @@ static int bootm_load_os(bootm_headers_t *images, unsigned long *load_end,
|
|||
return BOOTM_ERR_RESET;
|
||||
}
|
||||
|
||||
*load_end = load + unc_len;
|
||||
*load_end = load + size;
|
||||
break;
|
||||
}
|
||||
#endif /* CONFIG_LZO */
|
||||
default:
|
||||
printf("Unimplemented compression type %d\n", comp);
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@
|
|||
#include <bzlib.h>
|
||||
#endif
|
||||
#include <asm/byteorder.h>
|
||||
#include <asm/io.h>
|
||||
|
||||
#ifndef CONFIG_SYS_XIMG_LEN
|
||||
/* use 8MByte as default max gunzip size */
|
||||
|
|
@ -34,7 +35,7 @@ do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
|
|||
ulong data, len, count;
|
||||
int verify;
|
||||
int part = 0;
|
||||
image_header_t *hdr;
|
||||
image_header_t *hdr = NULL;
|
||||
#if defined(CONFIG_FIT)
|
||||
const char *uname = NULL;
|
||||
const void* fit_hdr;
|
||||
|
|
@ -222,7 +223,7 @@ do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
|
|||
* which requires at most 2300 KB of memory.
|
||||
*/
|
||||
i = BZ2_bzBuffToBuffDecompress(
|
||||
(char *)ntohl(hdr->ih_load),
|
||||
map_sysmem(ntohl(hdr->ih_load), 0),
|
||||
&unc_len, (char *)data, len,
|
||||
CONFIG_SYS_MALLOC_LEN < (4096 * 1024),
|
||||
0);
|
||||
|
|
|
|||
20
config.mk
20
config.mk
|
|
@ -241,22 +241,6 @@ ifneq ($(CONFIG_SYS_TEXT_BASE),)
|
|||
CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE)
|
||||
endif
|
||||
|
||||
ifneq ($(CONFIG_SPL_TEXT_BASE),)
|
||||
CPPFLAGS += -DCONFIG_SPL_TEXT_BASE=$(CONFIG_SPL_TEXT_BASE)
|
||||
endif
|
||||
|
||||
ifneq ($(CONFIG_SPL_PAD_TO),)
|
||||
CPPFLAGS += -DCONFIG_SPL_PAD_TO=$(CONFIG_SPL_PAD_TO)
|
||||
endif
|
||||
|
||||
ifneq ($(CONFIG_TPL_PAD_TO),)
|
||||
CPPFLAGS += -DCONFIG_TPL_PAD_TO=$(CONFIG_TPL_PAD_TO)
|
||||
endif
|
||||
|
||||
ifneq ($(CONFIG_UBOOT_PAD_TO),)
|
||||
CPPFLAGS += -DCONFIG_UBOOT_PAD_TO=$(CONFIG_UBOOT_PAD_TO)
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_SPL_BUILD),y)
|
||||
CPPFLAGS += -DCONFIG_SPL_BUILD
|
||||
ifeq ($(CONFIG_TPL_BUILD),y)
|
||||
|
|
@ -272,10 +256,6 @@ Please undefined CONFIG_SYS_GENERIC_BOARD in your board config file)
|
|||
endif
|
||||
endif
|
||||
|
||||
ifneq ($(RESET_VECTOR_ADDRESS),)
|
||||
CPPFLAGS += -DRESET_VECTOR_ADDRESS=$(RESET_VECTOR_ADDRESS)
|
||||
endif
|
||||
|
||||
ifneq ($(OBJTREE),$(SRCTREE))
|
||||
CPPFLAGS += -I$(OBJTREE)/include2 -I$(OBJTREE)/include
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -22,8 +22,9 @@ alias jasonjin Jason Jin <jason.jin@freescale.com>
|
|||
alias jhersh Joe Hershberger <joe.hershberger@gmail.com>
|
||||
alias kimphill Kim Phillips <kim.phillips@freescale.com>
|
||||
alias macpaul Macpaul Lin <macpaul@andestech.com>
|
||||
alias marex Marek Vasut <marek.vasut@gmail.com>
|
||||
alias marex Marek Vasut <marex@denx.de>
|
||||
alias monstr Michal Simek <monstr@monstr.eu>
|
||||
alias panto Pantelis Antoniou <panto@antoniou-consulting.com>
|
||||
alias prafulla Prafulla Wadaskar <prafulla@marvell.com>
|
||||
alias prom Minkyu Kang <mk7.kang@samsung.com>
|
||||
alias rbohmer Remy Bohmer <linux@bohmer.net>
|
||||
|
|
@ -102,7 +103,7 @@ alias cfi uboot, stroese
|
|||
alias kerneldoc uboot, marex
|
||||
alias fdt uboot, Jerry Van Baren <vanbaren@cideas.com>
|
||||
alias i2c uboot, hs
|
||||
alias mmc uboot, afleming
|
||||
alias mmc uboot, panto
|
||||
alias nand uboot, scottwood
|
||||
alias net uboot, jhersh
|
||||
alias usb uboot, marex
|
||||
|
|
|
|||
|
|
@ -16,14 +16,14 @@
|
|||
#include <asm/io.h>
|
||||
#include <malloc.h>
|
||||
#include <scsi.h>
|
||||
#include <ata.h>
|
||||
#include <libata.h>
|
||||
#include <linux/ctype.h>
|
||||
#include <ahci.h>
|
||||
|
||||
static int ata_io_flush(u8 port);
|
||||
|
||||
struct ahci_probe_ent *probe_ent = NULL;
|
||||
hd_driveid_t *ataid[AHCI_MAX_PORTS];
|
||||
u16 *ataid[AHCI_MAX_PORTS];
|
||||
|
||||
#define writel_with_flush(a,b) do { writel(a,b); readl(b); } while (0)
|
||||
|
||||
|
|
@ -38,7 +38,7 @@ hd_driveid_t *ataid[AHCI_MAX_PORTS];
|
|||
#endif
|
||||
|
||||
/* Maximum timeouts for each event */
|
||||
#define WAIT_MS_SPINUP 10000
|
||||
#define WAIT_MS_SPINUP 20000
|
||||
#define WAIT_MS_DATAIO 5000
|
||||
#define WAIT_MS_FLUSH 5000
|
||||
#define WAIT_MS_LINKUP 4
|
||||
|
|
@ -107,6 +107,27 @@ static int waiting_for_cmd_completed(volatile u8 *offset,
|
|||
return (i < timeout_msec) ? 0 : -1;
|
||||
}
|
||||
|
||||
int __weak ahci_link_up(struct ahci_probe_ent *probe_ent, u8 port)
|
||||
{
|
||||
u32 tmp;
|
||||
int j = 0;
|
||||
u8 *port_mmio = (u8 *)probe_ent->port[port].port_mmio;
|
||||
|
||||
/*
|
||||
* Bring up SATA link.
|
||||
* SATA link bringup time is usually less than 1 ms; only very
|
||||
* rarely has it taken between 1-2 ms. Never seen it above 2 ms.
|
||||
*/
|
||||
while (j < WAIT_MS_LINKUP) {
|
||||
tmp = readl(port_mmio + PORT_SCR_STAT);
|
||||
tmp &= PORT_SCR_STAT_DET_MASK;
|
||||
if (tmp == PORT_SCR_STAT_DET_PHYRDY)
|
||||
return 0;
|
||||
udelay(1000);
|
||||
j++;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int ahci_host_init(struct ahci_probe_ent *probe_ent)
|
||||
{
|
||||
|
|
@ -117,8 +138,9 @@ static int ahci_host_init(struct ahci_probe_ent *probe_ent)
|
|||
#endif
|
||||
volatile u8 *mmio = (volatile u8 *)probe_ent->mmio_base;
|
||||
u32 tmp, cap_save, cmd;
|
||||
int i, j;
|
||||
int i, j, ret;
|
||||
volatile u8 *port_mmio;
|
||||
u32 port_map;
|
||||
|
||||
debug("ahci_host_init: start\n");
|
||||
|
||||
|
|
@ -160,6 +182,7 @@ static int ahci_host_init(struct ahci_probe_ent *probe_ent)
|
|||
#endif
|
||||
probe_ent->cap = readl(mmio + HOST_CAP);
|
||||
probe_ent->port_map = readl(mmio + HOST_PORTS_IMPL);
|
||||
port_map = probe_ent->port_map;
|
||||
probe_ent->n_ports = (probe_ent->cap & 0x1f) + 1;
|
||||
|
||||
debug("cap 0x%x port_map 0x%x n_ports %d\n",
|
||||
|
|
@ -169,6 +192,8 @@ static int ahci_host_init(struct ahci_probe_ent *probe_ent)
|
|||
probe_ent->n_ports = CONFIG_SYS_SCSI_MAX_SCSI_ID;
|
||||
|
||||
for (i = 0; i < probe_ent->n_ports; i++) {
|
||||
if (!(port_map & (1 << i)))
|
||||
continue;
|
||||
probe_ent->port[i].port_mmio = ahci_port_base((u32) mmio, i);
|
||||
port_mmio = (u8 *) probe_ent->port[i].port_mmio;
|
||||
ahci_setup_port(&probe_ent->port[i], (unsigned long)mmio, i);
|
||||
|
|
@ -196,19 +221,9 @@ static int ahci_host_init(struct ahci_probe_ent *probe_ent)
|
|||
cmd |= PORT_CMD_SPIN_UP;
|
||||
writel_with_flush(cmd, port_mmio + PORT_CMD);
|
||||
|
||||
/* Bring up SATA link.
|
||||
* SATA link bringup time is usually less than 1 ms; only very
|
||||
* rarely has it taken between 1-2 ms. Never seen it above 2 ms.
|
||||
*/
|
||||
j = 0;
|
||||
while (j < WAIT_MS_LINKUP) {
|
||||
tmp = readl(port_mmio + PORT_SCR_STAT);
|
||||
if ((tmp & 0xf) == 0x3)
|
||||
break;
|
||||
udelay(1000);
|
||||
j++;
|
||||
}
|
||||
if (j == WAIT_MS_LINKUP) {
|
||||
/* Bring up SATA link. */
|
||||
ret = ahci_link_up(probe_ent, i);
|
||||
if (ret) {
|
||||
printf("SATA link %d timeout.\n", i);
|
||||
continue;
|
||||
} else {
|
||||
|
|
@ -225,11 +240,23 @@ static int ahci_host_init(struct ahci_probe_ent *probe_ent)
|
|||
j = 0;
|
||||
while (j < WAIT_MS_SPINUP) {
|
||||
tmp = readl(port_mmio + PORT_TFDATA);
|
||||
if (!(tmp & (ATA_STAT_BUSY | ATA_STAT_DRQ)))
|
||||
if (!(tmp & (ATA_BUSY | ATA_DRQ)))
|
||||
break;
|
||||
udelay(1000);
|
||||
tmp = readl(port_mmio + PORT_SCR_STAT);
|
||||
tmp &= PORT_SCR_STAT_DET_MASK;
|
||||
if (tmp == PORT_SCR_STAT_DET_PHYRDY)
|
||||
break;
|
||||
j++;
|
||||
}
|
||||
|
||||
tmp = readl(port_mmio + PORT_SCR_STAT) & PORT_SCR_STAT_DET_MASK;
|
||||
if (tmp == PORT_SCR_STAT_DET_COMINIT) {
|
||||
debug("SATA link %d down (COMINIT received), retrying...\n", i);
|
||||
i--;
|
||||
continue;
|
||||
}
|
||||
|
||||
printf("Target spinup took %d ms.\n", j);
|
||||
if (j == WAIT_MS_SPINUP)
|
||||
debug("timeout.\n");
|
||||
|
|
@ -254,7 +281,7 @@ static int ahci_host_init(struct ahci_probe_ent *probe_ent)
|
|||
/* register linkup ports */
|
||||
tmp = readl(port_mmio + PORT_SCR_STAT);
|
||||
debug("SATA port %d status: 0x%x\n", i, tmp);
|
||||
if ((tmp & 0xf) == 0x03)
|
||||
if ((tmp & PORT_SCR_STAT_DET_MASK) == PORT_SCR_STAT_DET_PHYRDY)
|
||||
probe_ent->link_port_map |= (0x01 << i);
|
||||
}
|
||||
|
||||
|
|
@ -351,8 +378,6 @@ static int ahci_init_one(pci_dev_t pdev)
|
|||
u16 vendor;
|
||||
int rc;
|
||||
|
||||
memset((void *)ataid, 0, sizeof(hd_driveid_t *) * AHCI_MAX_PORTS);
|
||||
|
||||
probe_ent = malloc(sizeof(struct ahci_probe_ent));
|
||||
memset(probe_ent, 0, sizeof(struct ahci_probe_ent));
|
||||
probe_ent->dev = pdev;
|
||||
|
|
@ -442,7 +467,7 @@ static void ahci_set_feature(u8 port)
|
|||
memset(fis, 0, sizeof(fis));
|
||||
fis[0] = 0x27;
|
||||
fis[1] = 1 << 7;
|
||||
fis[2] = ATA_CMD_SETF;
|
||||
fis[2] = ATA_CMD_SET_FEATURES;
|
||||
fis[3] = SETFEATURES_XFER;
|
||||
fis[12] = __ilog2(probe_ent->udma_mask + 1) + 0x40 - 0x01;
|
||||
|
||||
|
|
@ -580,33 +605,12 @@ static char *ata_id_strcpy(u16 *target, u16 *src, int len)
|
|||
return (char *)target;
|
||||
}
|
||||
|
||||
|
||||
static void dump_ataid(hd_driveid_t *ataid)
|
||||
{
|
||||
debug("(49)ataid->capability = 0x%x\n", ataid->capability);
|
||||
debug("(53)ataid->field_valid =0x%x\n", ataid->field_valid);
|
||||
debug("(63)ataid->dma_mword = 0x%x\n", ataid->dma_mword);
|
||||
debug("(64)ataid->eide_pio_modes = 0x%x\n", ataid->eide_pio_modes);
|
||||
debug("(75)ataid->queue_depth = 0x%x\n", ataid->queue_depth);
|
||||
debug("(80)ataid->major_rev_num = 0x%x\n", ataid->major_rev_num);
|
||||
debug("(81)ataid->minor_rev_num = 0x%x\n", ataid->minor_rev_num);
|
||||
debug("(82)ataid->command_set_1 = 0x%x\n", ataid->command_set_1);
|
||||
debug("(83)ataid->command_set_2 = 0x%x\n", ataid->command_set_2);
|
||||
debug("(84)ataid->cfsse = 0x%x\n", ataid->cfsse);
|
||||
debug("(85)ataid->cfs_enable_1 = 0x%x\n", ataid->cfs_enable_1);
|
||||
debug("(86)ataid->cfs_enable_2 = 0x%x\n", ataid->cfs_enable_2);
|
||||
debug("(87)ataid->csf_default = 0x%x\n", ataid->csf_default);
|
||||
debug("(88)ataid->dma_ultra = 0x%x\n", ataid->dma_ultra);
|
||||
debug("(93)ataid->hw_config = 0x%x\n", ataid->hw_config);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* SCSI INQUIRY command operation.
|
||||
*/
|
||||
static int ata_scsiop_inquiry(ccb *pccb)
|
||||
{
|
||||
u8 hdr[] = {
|
||||
static const u8 hdr[] = {
|
||||
0,
|
||||
0,
|
||||
0x5, /* claim SPC-3 version compatibility */
|
||||
|
|
@ -614,7 +618,7 @@ static int ata_scsiop_inquiry(ccb *pccb)
|
|||
95 - 4,
|
||||
};
|
||||
u8 fis[20];
|
||||
u8 *tmpid;
|
||||
u16 *tmpid;
|
||||
u8 port;
|
||||
|
||||
/* Clean ccb data buffer */
|
||||
|
|
@ -629,28 +633,33 @@ static int ata_scsiop_inquiry(ccb *pccb)
|
|||
/* Construct the FIS */
|
||||
fis[0] = 0x27; /* Host to device FIS. */
|
||||
fis[1] = 1 << 7; /* Command FIS. */
|
||||
fis[2] = ATA_CMD_IDENT; /* Command byte. */
|
||||
fis[2] = ATA_CMD_ID_ATA; /* Command byte. */
|
||||
|
||||
/* Read id from sata */
|
||||
port = pccb->target;
|
||||
if (!(tmpid = malloc(sizeof(hd_driveid_t))))
|
||||
tmpid = malloc(ATA_ID_WORDS * 2);
|
||||
if (!tmpid)
|
||||
return -ENOMEM;
|
||||
|
||||
if (ahci_device_data_io(port, (u8 *) &fis, sizeof(fis), tmpid,
|
||||
sizeof(hd_driveid_t), 0)) {
|
||||
if (ahci_device_data_io(port, (u8 *) &fis, sizeof(fis), (u8 *)tmpid,
|
||||
ATA_ID_WORDS * 2, 0)) {
|
||||
debug("scsi_ahci: SCSI inquiry command failure.\n");
|
||||
free(tmpid);
|
||||
return -EIO;
|
||||
}
|
||||
|
||||
if (ataid[port])
|
||||
free(ataid[port]);
|
||||
ataid[port] = (hd_driveid_t *) tmpid;
|
||||
ataid[port] = tmpid;
|
||||
ata_swap_buf_le16(tmpid, ATA_ID_WORDS);
|
||||
|
||||
memcpy(&pccb->pdata[8], "ATA ", 8);
|
||||
ata_id_strcpy((u16 *) &pccb->pdata[16], (u16 *)ataid[port]->model, 16);
|
||||
ata_id_strcpy((u16 *) &pccb->pdata[32], (u16 *)ataid[port]->fw_rev, 4);
|
||||
ata_id_strcpy((u16 *) &pccb->pdata[16], &tmpid[ATA_ID_PROD], 16);
|
||||
ata_id_strcpy((u16 *) &pccb->pdata[32], &tmpid[ATA_ID_FW_REV], 4);
|
||||
|
||||
dump_ataid(ataid[port]);
|
||||
#ifdef DEBUG
|
||||
ata_dump_id(tmpid);
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -698,7 +707,7 @@ static int ata_scsiop_read_write(ccb *pccb, u8 is_write)
|
|||
|
||||
now_blocks = min(MAX_SATA_BLOCKS_READ_WRITE, blocks);
|
||||
|
||||
transfer_size = ATA_BLOCKSIZE * now_blocks;
|
||||
transfer_size = ATA_SECT_SIZE * now_blocks;
|
||||
if (transfer_size > user_buffer_size) {
|
||||
printf("scsi_ahci: Error: buffer too small.\n");
|
||||
return -EIO;
|
||||
|
|
@ -753,6 +762,7 @@ static int ata_scsiop_read_write(ccb *pccb, u8 is_write)
|
|||
static int ata_scsiop_read_capacity10(ccb *pccb)
|
||||
{
|
||||
u32 cap;
|
||||
u64 cap64;
|
||||
u32 block_size;
|
||||
|
||||
if (!ataid[pccb->target]) {
|
||||
|
|
@ -762,18 +772,11 @@ static int ata_scsiop_read_capacity10(ccb *pccb)
|
|||
return -EPERM;
|
||||
}
|
||||
|
||||
cap = le32_to_cpu(ataid[pccb->target]->lba_capacity);
|
||||
if (cap == 0xfffffff) {
|
||||
unsigned short *cap48 = ataid[pccb->target]->lba48_capacity;
|
||||
if (cap48[2] || cap48[3]) {
|
||||
cap = 0xffffffff;
|
||||
} else {
|
||||
cap = (le16_to_cpu(cap48[1]) << 16) |
|
||||
(le16_to_cpu(cap48[0]));
|
||||
}
|
||||
}
|
||||
cap64 = ata_id_n_sectors(ataid[pccb->target]);
|
||||
if (cap64 > 0x100000000ULL)
|
||||
cap64 = 0xffffffff;
|
||||
|
||||
cap = cpu_to_be32(cap);
|
||||
cap = cpu_to_be32(cap64);
|
||||
memcpy(pccb->pdata, &cap, sizeof(cap));
|
||||
|
||||
block_size = cpu_to_be32((u32)512);
|
||||
|
|
@ -798,12 +801,7 @@ static int ata_scsiop_read_capacity16(ccb *pccb)
|
|||
return -EPERM;
|
||||
}
|
||||
|
||||
cap = le32_to_cpu(ataid[pccb->target]->lba_capacity);
|
||||
if (cap == 0xfffffff) {
|
||||
memcpy(&cap, ataid[pccb->target]->lba48_capacity, sizeof(cap));
|
||||
cap = le64_to_cpu(cap);
|
||||
}
|
||||
|
||||
cap = ata_id_n_sectors(ataid[pccb->target]);
|
||||
cap = cpu_to_be64(cap);
|
||||
memcpy(pccb->pdata, &cap, sizeof(cap));
|
||||
|
||||
|
|
@ -890,8 +888,6 @@ int ahci_init(u32 base)
|
|||
int i, rc = 0;
|
||||
u32 linkmap;
|
||||
|
||||
memset(ataid, 0, sizeof(ataid));
|
||||
|
||||
probe_ent = malloc(sizeof(struct ahci_probe_ent));
|
||||
memset(probe_ent, 0, sizeof(struct ahci_probe_ent));
|
||||
|
||||
|
|
|
|||
|
|
@ -14,6 +14,198 @@
|
|||
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
|
||||
static const char max77686_buck_addr[] = {
|
||||
0xff, 0x10, 0x12, 0x1c, 0x26, 0x30, 0x32, 0x34, 0x36, 0x38
|
||||
};
|
||||
|
||||
static unsigned int max77686_ldo_volt2hex(int ldo, ulong uV)
|
||||
{
|
||||
unsigned int hex = 0;
|
||||
|
||||
switch (ldo) {
|
||||
case 1:
|
||||
case 2:
|
||||
case 6:
|
||||
case 7:
|
||||
case 8:
|
||||
case 15:
|
||||
hex = (uV - 800000) / 25000;
|
||||
break;
|
||||
default:
|
||||
hex = (uV - 800000) / 50000;
|
||||
}
|
||||
|
||||
if (hex >= 0 && hex <= MAX77686_LDO_VOLT_MAX_HEX)
|
||||
return hex;
|
||||
|
||||
debug("%s: %ld is wrong voltage value for LDO%d\n", __func__, uV, ldo);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int max77686_set_ldo_voltage(struct pmic *p, int ldo, ulong uV)
|
||||
{
|
||||
unsigned int val, ret, hex, adr;
|
||||
|
||||
if (ldo < 1 && ldo > 26) {
|
||||
printf("%s: %d is wrong ldo number\n", __func__, ldo);
|
||||
return -1;
|
||||
}
|
||||
|
||||
adr = MAX77686_REG_PMIC_LDO1CTRL1 + ldo - 1;
|
||||
hex = max77686_ldo_volt2hex(ldo, uV);
|
||||
|
||||
if (!hex)
|
||||
return -1;
|
||||
|
||||
ret = pmic_reg_read(p, adr, &val);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
val &= ~MAX77686_LDO_VOLT_MASK;
|
||||
val |= hex;
|
||||
ret |= pmic_reg_write(p, adr, val);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
int max77686_set_ldo_mode(struct pmic *p, int ldo, char opmode)
|
||||
{
|
||||
unsigned int val, ret, adr, mode;
|
||||
|
||||
if (ldo < 1 && 26 < ldo) {
|
||||
printf("%s: %d is wrong ldo number\n", __func__, ldo);
|
||||
return -1;
|
||||
}
|
||||
|
||||
adr = MAX77686_REG_PMIC_LDO1CTRL1 + ldo - 1;
|
||||
|
||||
/* mode */
|
||||
switch (opmode) {
|
||||
case OPMODE_OFF:
|
||||
mode = MAX77686_LDO_MODE_OFF;
|
||||
break;
|
||||
case OPMODE_STANDBY:
|
||||
switch (ldo) {
|
||||
case 2:
|
||||
case 6:
|
||||
case 7:
|
||||
case 8:
|
||||
case 10:
|
||||
case 11:
|
||||
case 12:
|
||||
case 14:
|
||||
case 15:
|
||||
case 16:
|
||||
mode = MAX77686_LDO_MODE_STANDBY;
|
||||
break;
|
||||
default:
|
||||
mode = 0xff;
|
||||
}
|
||||
break;
|
||||
case OPMODE_LPM:
|
||||
mode = MAX77686_LDO_MODE_LPM;
|
||||
break;
|
||||
case OPMODE_ON:
|
||||
mode = MAX77686_LDO_MODE_ON;
|
||||
break;
|
||||
default:
|
||||
mode = 0xff;
|
||||
}
|
||||
|
||||
if (mode == 0xff) {
|
||||
printf("%s: %d is not supported on LDO%d\n",
|
||||
__func__, opmode, ldo);
|
||||
return -1;
|
||||
}
|
||||
|
||||
ret = pmic_reg_read(p, adr, &val);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
val &= ~MAX77686_LDO_MODE_MASK;
|
||||
val |= mode;
|
||||
ret |= pmic_reg_write(p, adr, val);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
int max77686_set_buck_mode(struct pmic *p, int buck, char opmode)
|
||||
{
|
||||
unsigned int val, ret, mask, adr, size, mode, mode_shift;
|
||||
|
||||
size = ARRAY_SIZE(max77686_buck_addr);
|
||||
if (buck >= size) {
|
||||
printf("%s: %d is wrong buck number\n", __func__, buck);
|
||||
return -1;
|
||||
}
|
||||
|
||||
adr = max77686_buck_addr[buck];
|
||||
|
||||
/* mask */
|
||||
switch (buck) {
|
||||
case 2:
|
||||
case 3:
|
||||
case 4:
|
||||
mode_shift = MAX77686_BUCK_MODE_SHIFT_2;
|
||||
break;
|
||||
default:
|
||||
mode_shift = MAX77686_BUCK_MODE_SHIFT_1;
|
||||
}
|
||||
|
||||
mask = MAX77686_BUCK_MODE_MASK << mode_shift;
|
||||
|
||||
/* mode */
|
||||
switch (opmode) {
|
||||
case OPMODE_OFF:
|
||||
mode = MAX77686_BUCK_MODE_OFF;
|
||||
break;
|
||||
case OPMODE_STANDBY:
|
||||
switch (buck) {
|
||||
case 1:
|
||||
case 2:
|
||||
case 3:
|
||||
case 4:
|
||||
mode = MAX77686_BUCK_MODE_STANDBY << mode_shift;
|
||||
break;
|
||||
default:
|
||||
mode = 0xff;
|
||||
}
|
||||
break;
|
||||
case OPMODE_LPM:
|
||||
switch (buck) {
|
||||
case 2:
|
||||
case 3:
|
||||
case 4:
|
||||
mode = MAX77686_BUCK_MODE_LPM << mode_shift;
|
||||
break;
|
||||
default:
|
||||
mode = 0xff;
|
||||
}
|
||||
break;
|
||||
case OPMODE_ON:
|
||||
mode = MAX77686_BUCK_MODE_ON << mode_shift;
|
||||
break;
|
||||
default:
|
||||
mode = 0xff;
|
||||
}
|
||||
|
||||
if (mode == 0xff) {
|
||||
printf("%s: %d is not supported on BUCK%d\n",
|
||||
__func__, opmode, buck);
|
||||
return -1;
|
||||
}
|
||||
|
||||
ret = pmic_reg_read(p, adr, &val);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
val &= ~mask;
|
||||
val |= mode;
|
||||
ret |= pmic_reg_write(p, adr, val);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
int pmic_init(unsigned char bus)
|
||||
{
|
||||
static const char name[] = "MAX77686_PMIC";
|
||||
|
|
|
|||
|
|
@ -552,9 +552,11 @@ set_cluster(fsdata *mydata, __u32 clustnum, __u8 *buffer,
|
|||
|
||||
debug("clustnum: %d, startsect: %d\n", clustnum, startsect);
|
||||
|
||||
if (disk_write(startsect, size / mydata->sect_size, buffer) < 0) {
|
||||
debug("Error writing data\n");
|
||||
return -1;
|
||||
if ((size / mydata->sect_size) > 0) {
|
||||
if (disk_write(startsect, size / mydata->sect_size, buffer) < 0) {
|
||||
debug("Error writing data\n");
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
if (size % mydata->sect_size) {
|
||||
|
|
|
|||
|
|
@ -87,6 +87,11 @@
|
|||
| PORT_IRQ_DMAS_FIS | PORT_IRQ_PIOS_FIS \
|
||||
| PORT_IRQ_D2H_REG_FIS
|
||||
|
||||
/* PORT_SCR_STAT bits */
|
||||
#define PORT_SCR_STAT_DET_MASK 0x3
|
||||
#define PORT_SCR_STAT_DET_COMINIT 0x1
|
||||
#define PORT_SCR_STAT_DET_PHYRDY 0x3
|
||||
|
||||
/* PORT_CMD bits */
|
||||
#define PORT_CMD_ATAPI (1 << 24) /* Device is ATAPI */
|
||||
#define PORT_CMD_LIST_ON (1 << 15) /* cmd list DMA engine running */
|
||||
|
|
@ -103,29 +108,6 @@
|
|||
|
||||
#define AHCI_MAX_PORTS 32
|
||||
|
||||
/* SETFEATURES stuff */
|
||||
#define SETFEATURES_XFER 0x03
|
||||
#define XFER_UDMA_7 0x47
|
||||
#define XFER_UDMA_6 0x46
|
||||
#define XFER_UDMA_5 0x45
|
||||
#define XFER_UDMA_4 0x44
|
||||
#define XFER_UDMA_3 0x43
|
||||
#define XFER_UDMA_2 0x42
|
||||
#define XFER_UDMA_1 0x41
|
||||
#define XFER_UDMA_0 0x40
|
||||
#define XFER_MW_DMA_2 0x22
|
||||
#define XFER_MW_DMA_1 0x21
|
||||
#define XFER_MW_DMA_0 0x20
|
||||
#define XFER_SW_DMA_2 0x12
|
||||
#define XFER_SW_DMA_1 0x11
|
||||
#define XFER_SW_DMA_0 0x10
|
||||
#define XFER_PIO_4 0x0C
|
||||
#define XFER_PIO_3 0x0B
|
||||
#define XFER_PIO_2 0x0A
|
||||
#define XFER_PIO_1 0x09
|
||||
#define XFER_PIO_0 0x08
|
||||
#define XFER_PIO_SLOW 0x00
|
||||
|
||||
#define ATA_FLAG_SATA (1 << 3)
|
||||
#define ATA_FLAG_NO_LEGACY (1 << 4) /* no legacy mode check */
|
||||
#define ATA_FLAG_MMIO (1 << 6) /* use MMIO, not PIO */
|
||||
|
|
|
|||
|
|
@ -318,6 +318,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
|
|||
#define CONFIG_SCSI_AHCI
|
||||
|
||||
#ifdef CONFIG_SCSI_AHCI
|
||||
#define CONFIG_LIBATA
|
||||
#define CONFIG_SATA_ULI5288
|
||||
#define CONFIG_SYS_SCSI_MAX_SCSI_ID 4
|
||||
#define CONFIG_SYS_SCSI_MAX_LUN 1
|
||||
|
|
|
|||
|
|
@ -539,6 +539,7 @@
|
|||
#define CONFIG_SCSI_AHCI
|
||||
|
||||
#ifdef CONFIG_SCSI_AHCI
|
||||
#define CONFIG_LIBATA
|
||||
#define CONFIG_SATA_ULI5288
|
||||
#define CONFIG_SYS_SCSI_MAX_SCSI_ID 4
|
||||
#define CONFIG_SYS_SCSI_MAX_LUN 1
|
||||
|
|
|
|||
|
|
@ -326,6 +326,7 @@
|
|||
#define CONFIG_SCSI_AHCI
|
||||
|
||||
#ifdef CONFIG_SCSI_AHCI
|
||||
#define CONFIG_LIBATA
|
||||
#define CONFIG_SATA_ULI5288
|
||||
#define CONFIG_SYS_SCSI_MAX_SCSI_ID 4
|
||||
#define CONFIG_SYS_SCSI_MAX_LUN 1
|
||||
|
|
|
|||
|
|
@ -412,6 +412,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
|
|||
#define CONFIG_SCSI_AHCI
|
||||
|
||||
#ifdef CONFIG_SCSI_AHCI
|
||||
#define CONFIG_LIBATA
|
||||
#define CONFIG_SATA_ULI5288
|
||||
#define CONFIG_SYS_SCSI_MAX_SCSI_ID 4
|
||||
#define CONFIG_SYS_SCSI_MAX_LUN 1
|
||||
|
|
|
|||
|
|
@ -513,6 +513,7 @@
|
|||
#define CONFIG_SCSI_AHCI
|
||||
|
||||
#ifdef CONFIG_SCSI_AHCI
|
||||
#define CONFIG_LIBATA
|
||||
#define CONFIG_SATA_ULI5288
|
||||
#define CONFIG_SYS_SCSI_MAX_SCSI_ID 4
|
||||
#define CONFIG_SYS_SCSI_MAX_LUN 1
|
||||
|
|
|
|||
|
|
@ -132,7 +132,9 @@
|
|||
"echo Running uenvcmd ...;" \
|
||||
"run uenvcmd;" \
|
||||
"fi;" \
|
||||
"run mmcloados;" \
|
||||
"if run loaduimage; then " \
|
||||
"run mmcloados;" \
|
||||
"fi;" \
|
||||
"fi;\0" \
|
||||
"spiboot=echo Booting from spi ...; " \
|
||||
"run spiargs; " \
|
||||
|
|
|
|||
|
|
@ -0,0 +1,255 @@
|
|||
/*
|
||||
* Copyright (C) 2013 Samsung Electronics
|
||||
*
|
||||
* SPDX-License-Identifier: GPL-2.0+
|
||||
*
|
||||
* Configuration settings for the SAMSUNG Arndale board.
|
||||
*/
|
||||
|
||||
#ifndef __CONFIG_ARNDALE_H
|
||||
#define __CONFIG_ARNDALE_H
|
||||
|
||||
/* High Level Configuration Options */
|
||||
#define CONFIG_SAMSUNG /* in a SAMSUNG core */
|
||||
#define CONFIG_S5P /* S5P Family */
|
||||
#define CONFIG_EXYNOS5 /* which is in a Exynos5 Family */
|
||||
#define CONFIG_EXYNOS5250
|
||||
|
||||
#include <asm/arch/cpu.h> /* get chip and board defs */
|
||||
|
||||
#define CONFIG_SYS_GENERIC_BOARD
|
||||
#define CONFIG_ARCH_CPU_INIT
|
||||
#define CONFIG_DISPLAY_CPUINFO
|
||||
#define CONFIG_DISPLAY_BOARDINFO
|
||||
|
||||
/* Enable fdt support for Exynos5250 */
|
||||
#define CONFIG_ARCH_DEVICE_TREE exynos5250
|
||||
#define CONFIG_OF_CONTROL
|
||||
#define CONFIG_OF_SEPARATE
|
||||
|
||||
/* Allow tracing to be enabled */
|
||||
#define CONFIG_TRACE
|
||||
#define CONFIG_CMD_TRACE
|
||||
#define CONFIG_TRACE_BUFFER_SIZE (16 << 20)
|
||||
#define CONFIG_TRACE_EARLY_SIZE (8 << 20)
|
||||
#define CONFIG_TRACE_EARLY
|
||||
#define CONFIG_TRACE_EARLY_ADDR 0x50000000
|
||||
|
||||
/* Keep L2 Cache Disabled */
|
||||
#define CONFIG_SYS_DCACHE_OFF
|
||||
|
||||
#define CONFIG_SYS_SDRAM_BASE 0x40000000
|
||||
#define CONFIG_SYS_TEXT_BASE 0x43E00000
|
||||
|
||||
/* input clock of PLL: SMDK5250 has 24MHz input clock */
|
||||
#define CONFIG_SYS_CLK_FREQ 24000000
|
||||
|
||||
#define CONFIG_SETUP_MEMORY_TAGS
|
||||
#define CONFIG_CMDLINE_TAG
|
||||
#define CONFIG_INITRD_TAG
|
||||
#define CONFIG_CMDLINE_EDITING
|
||||
|
||||
/* Power Down Modes */
|
||||
#define S5P_CHECK_SLEEP 0x00000BAD
|
||||
#define S5P_CHECK_DIDLE 0xBAD00000
|
||||
#define S5P_CHECK_LPA 0xABAD0000
|
||||
|
||||
/* Offset for inform registers */
|
||||
#define INFORM0_OFFSET 0x800
|
||||
#define INFORM1_OFFSET 0x804
|
||||
|
||||
/* Size of malloc() pool */
|
||||
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (4 << 20))
|
||||
|
||||
/* select serial console configuration */
|
||||
#define CONFIG_BAUDRATE 115200
|
||||
#define EXYNOS5_DEFAULT_UART_OFFSET 0x010000
|
||||
#define CONFIG_SILENT_CONSOLE
|
||||
|
||||
/* Console configuration */
|
||||
#define CONFIG_CONSOLE_MUX
|
||||
#define CONFIG_SYS_CONSOLE_IS_IN_ENV
|
||||
#define EXYNOS_DEVICE_SETTINGS \
|
||||
"stdin=serial\0" \
|
||||
"stdout=serial\0" \
|
||||
"stderr=serial\0"
|
||||
|
||||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||
EXYNOS_DEVICE_SETTINGS
|
||||
|
||||
/* SD/MMC configuration */
|
||||
#define CONFIG_GENERIC_MMC
|
||||
#define CONFIG_MMC
|
||||
#define CONFIG_SDHCI
|
||||
#define CONFIG_S5P_SDHCI
|
||||
#define CONFIG_DWMMC
|
||||
#define CONFIG_EXYNOS_DWMMC
|
||||
#define CONFIG_SUPPORT_EMMC_BOOT
|
||||
|
||||
|
||||
#define CONFIG_BOARD_EARLY_INIT_F
|
||||
#define CONFIG_SKIP_LOWLEVEL_INIT
|
||||
|
||||
/* PWM */
|
||||
#define CONFIG_PWM
|
||||
|
||||
/* allow to overwrite serial and ethaddr */
|
||||
#define CONFIG_ENV_OVERWRITE
|
||||
|
||||
/* Command definition*/
|
||||
#include <config_cmd_default.h>
|
||||
|
||||
#define CONFIG_CMD_PING
|
||||
#define CONFIG_CMD_ELF
|
||||
#define CONFIG_CMD_MMC
|
||||
#define CONFIG_CMD_EXT2
|
||||
#define CONFIG_CMD_FAT
|
||||
#define CONFIG_CMD_NET
|
||||
#define CONFIG_CMD_HASH
|
||||
|
||||
#define CONFIG_BOOTDELAY 3
|
||||
#define CONFIG_ZERO_BOOTDELAY_CHECK
|
||||
|
||||
/* USB */
|
||||
#define CONFIG_CMD_USB
|
||||
#define CONFIG_USB_EHCI
|
||||
#define CONFIG_USB_EHCI_EXYNOS
|
||||
#define CONFIG_USB_STORAGE
|
||||
|
||||
/* MMC SPL */
|
||||
#define CONFIG_SPL
|
||||
#define COPY_BL2_FNPTR_ADDR 0x02020030
|
||||
|
||||
#define CONFIG_SPL_LIBCOMMON_SUPPORT
|
||||
|
||||
/* specific .lds file */
|
||||
#define CONFIG_SPL_LDSCRIPT "board/samsung/common/exynos-uboot-spl.lds"
|
||||
#define CONFIG_SPL_TEXT_BASE 0x02023400
|
||||
#define CONFIG_SPL_MAX_FOOTPRINT (14 * 1024)
|
||||
|
||||
#define CONFIG_BOOTCOMMAND "mmc read 40007000 451 2000; bootm 40007000"
|
||||
|
||||
/* Miscellaneous configurable options */
|
||||
#define CONFIG_SYS_LONGHELP /* undef to save memory */
|
||||
#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */
|
||||
#define CONFIG_SYS_PROMPT "ARNDALE # "
|
||||
#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
|
||||
#define CONFIG_SYS_PBSIZE 384 /* Print Buffer Size */
|
||||
#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
|
||||
#define CONFIG_DEFAULT_CONSOLE "console=ttySAC2,115200n8\0"
|
||||
/* Boot Argument Buffer Size */
|
||||
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
|
||||
/* memtest works on */
|
||||
#define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE
|
||||
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_SDRAM_BASE + 0x5E00000)
|
||||
#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x3E00000)
|
||||
|
||||
#define CONFIG_SYS_HZ 1000
|
||||
|
||||
#define CONFIG_RD_LVL
|
||||
|
||||
#define CONFIG_NR_DRAM_BANKS 8
|
||||
#define SDRAM_BANK_SIZE (256UL << 20UL) /* 256 MB */
|
||||
#define PHYS_SDRAM_1 CONFIG_SYS_SDRAM_BASE
|
||||
#define PHYS_SDRAM_1_SIZE SDRAM_BANK_SIZE
|
||||
#define PHYS_SDRAM_2 (CONFIG_SYS_SDRAM_BASE + SDRAM_BANK_SIZE)
|
||||
#define PHYS_SDRAM_2_SIZE SDRAM_BANK_SIZE
|
||||
#define PHYS_SDRAM_3 (CONFIG_SYS_SDRAM_BASE + (2 * SDRAM_BANK_SIZE))
|
||||
#define PHYS_SDRAM_3_SIZE SDRAM_BANK_SIZE
|
||||
#define PHYS_SDRAM_4 (CONFIG_SYS_SDRAM_BASE + (3 * SDRAM_BANK_SIZE))
|
||||
#define PHYS_SDRAM_4_SIZE SDRAM_BANK_SIZE
|
||||
#define PHYS_SDRAM_5 (CONFIG_SYS_SDRAM_BASE + (4 * SDRAM_BANK_SIZE))
|
||||
#define PHYS_SDRAM_5_SIZE SDRAM_BANK_SIZE
|
||||
#define PHYS_SDRAM_6 (CONFIG_SYS_SDRAM_BASE + (5 * SDRAM_BANK_SIZE))
|
||||
#define PHYS_SDRAM_6_SIZE SDRAM_BANK_SIZE
|
||||
#define PHYS_SDRAM_7 (CONFIG_SYS_SDRAM_BASE + (6 * SDRAM_BANK_SIZE))
|
||||
#define PHYS_SDRAM_7_SIZE SDRAM_BANK_SIZE
|
||||
#define PHYS_SDRAM_8 (CONFIG_SYS_SDRAM_BASE + (7 * SDRAM_BANK_SIZE))
|
||||
#define PHYS_SDRAM_8_SIZE SDRAM_BANK_SIZE
|
||||
|
||||
#define CONFIG_SYS_MONITOR_BASE 0x00000000
|
||||
|
||||
/* FLASH and environment organization */
|
||||
#define CONFIG_SYS_NO_FLASH
|
||||
#undef CONFIG_CMD_IMLS
|
||||
#define CONFIG_IDENT_STRING " for ARNDALE"
|
||||
|
||||
#define CONFIG_SYS_MMC_ENV_DEV 0
|
||||
|
||||
#define CONFIG_ENV_IS_IN_MMC
|
||||
#define CONFIG_SECURE_BL1_ONLY
|
||||
|
||||
/* Secure FW size configuration */
|
||||
#ifdef CONFIG_SECURE_BL1_ONLY
|
||||
#define CONFIG_SEC_FW_SIZE (8 << 10) /* 8KB */
|
||||
#else
|
||||
#define CONFIG_SEC_FW_SIZE 0
|
||||
#endif
|
||||
|
||||
/* Configuration of BL1, BL2, ENV Blocks on mmc */
|
||||
#define CONFIG_RES_BLOCK_SIZE (512)
|
||||
#define CONFIG_BL1_SIZE (16 << 10) /*16 K reserved for BL1*/
|
||||
#define CONFIG_BL2_SIZE (512UL << 10UL) /* 512 KB */
|
||||
#define CONFIG_ENV_SIZE (16 << 10) /* 16 KB */
|
||||
|
||||
#define CONFIG_BL1_OFFSET (CONFIG_RES_BLOCK_SIZE + CONFIG_SEC_FW_SIZE)
|
||||
#define CONFIG_BL2_OFFSET (CONFIG_BL1_OFFSET + CONFIG_BL1_SIZE)
|
||||
#define CONFIG_ENV_OFFSET (CONFIG_BL2_OFFSET + CONFIG_BL2_SIZE)
|
||||
|
||||
/* U-boot copy size from boot Media to DRAM.*/
|
||||
#define BL2_START_OFFSET (CONFIG_BL2_OFFSET/512)
|
||||
#define BL2_SIZE_BLOC_COUNT (CONFIG_BL2_SIZE/512)
|
||||
|
||||
#define CONFIG_SPI_BOOTING
|
||||
#define EXYNOS_COPY_SPI_FNPTR_ADDR 0x02020058
|
||||
#define SPI_FLASH_UBOOT_POS (CONFIG_SEC_FW_SIZE + CONFIG_BL1_SIZE)
|
||||
|
||||
#define CONFIG_DOS_PARTITION
|
||||
#define CONFIG_EFI_PARTITION
|
||||
#define CONFIG_CMD_PART
|
||||
#define CONFIG_PARTITION_UUIDS
|
||||
|
||||
|
||||
#define CONFIG_IRAM_STACK 0x02050000
|
||||
|
||||
#define CONFIG_SYS_INIT_SP_ADDR CONFIG_IRAM_STACK
|
||||
|
||||
/* I2C */
|
||||
#define CONFIG_SYS_I2C_INIT_BOARD
|
||||
#define CONFIG_HARD_I2C
|
||||
#define CONFIG_CMD_I2C
|
||||
#define CONFIG_SYS_I2C_SPEED 100000 /* 100 Kbps */
|
||||
#define CONFIG_DRIVER_S3C24X0_I2C
|
||||
#define CONFIG_I2C_MULTI_BUS
|
||||
#define CONFIG_MAX_I2C_NUM 8
|
||||
#define CONFIG_SYS_I2C_SLAVE 0x0
|
||||
#define CONFIG_I2C_EDID
|
||||
|
||||
/* PMIC */
|
||||
#define CONFIG_PMIC
|
||||
#define CONFIG_PMIC_I2C
|
||||
#define CONFIG_PMIC_MAX77686
|
||||
|
||||
#define CONFIG_DEFAULT_DEVICE_TREE exynos5250-arndale
|
||||
|
||||
/* Ethernet Controllor Driver */
|
||||
#ifdef CONFIG_CMD_NET
|
||||
#define CONFIG_SMC911X
|
||||
#define CONFIG_SMC911X_BASE 0x5000000
|
||||
#define CONFIG_SMC911X_16_BIT
|
||||
#define CONFIG_ENV_SROM_BANK 1
|
||||
#endif /*CONFIG_CMD_NET*/
|
||||
|
||||
/* Enable PXE Support */
|
||||
#ifdef CONFIG_CMD_NET
|
||||
#define CONFIG_CMD_PXE
|
||||
#define CONFIG_MENU
|
||||
#endif
|
||||
|
||||
/* Enable devicetree support */
|
||||
#define CONFIG_OF_LIBFDT
|
||||
|
||||
/* Enable Time Command */
|
||||
#define CONFIG_CMD_TIME
|
||||
|
||||
#endif /* __CONFIG_H */
|
||||
|
|
@ -216,6 +216,8 @@
|
|||
#define CONFIG_SPL_STACK (0x00010000 + 0x7f00)
|
||||
|
||||
#define CONFIG_SPL_TEXT_BASE 0x00000020 /*CONFIG_SYS_SRAM_START*/
|
||||
/* Provide at least 16MB spacing between us and the Linux Kernel image */
|
||||
#define CONFIG_SPL_PAD_TO 12320
|
||||
#define CONFIG_SPL_MAX_FOOTPRINT 12288
|
||||
|
||||
#ifndef CONFIG_SPL_BUILD
|
||||
|
|
|
|||
|
|
@ -56,6 +56,7 @@
|
|||
#define CONFIG_SCSI_AHCI
|
||||
|
||||
#ifdef CONFIG_SCSI_AHCI
|
||||
#define CONFIG_LIBATA
|
||||
#define CONFIG_SYS_64BIT_LBA
|
||||
#define CONFIG_SATA_INTEL 1
|
||||
#define CONFIG_SCSI_DEV_LIST {PCI_VENDOR_ID_INTEL, \
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
#define CONFIG_SAMSUNG /* in a SAMSUNG core */
|
||||
#define CONFIG_S5P /* S5P Family */
|
||||
#define CONFIG_EXYNOS5 /* which is in a Exynos5 Family */
|
||||
#define CONFIG_SMDK5250 /* which is in a SMDK5250 */
|
||||
#define CONFIG_EXYNOS5250
|
||||
|
||||
#include <asm/arch/cpu.h> /* get chip and board defs */
|
||||
|
||||
|
|
|
|||
|
|
@ -39,6 +39,7 @@
|
|||
#define CONFIG_SYS_BOOTCOUNT_ADDR 0xfff3cf0c
|
||||
|
||||
#define CONFIG_MISC_INIT_R
|
||||
#define CONFIG_LIBATA
|
||||
#define CONFIG_SCSI_AHCI
|
||||
#define CONFIG_SCSI_AHCI_PLAT
|
||||
#define CONFIG_SYS_SCSI_MAX_SCSI_ID 5
|
||||
|
|
|
|||
|
|
@ -565,6 +565,7 @@
|
|||
#define CONFIG_SYS_GPIO_PHY1_RST 12
|
||||
#define CONFIG_SYS_GPIO_FLASH_WP 14
|
||||
#define CONFIG_SYS_GPIO_PHY0_RST 22
|
||||
#define CONFIG_SYS_GPIO_PERM_VOLT_FEED 49
|
||||
#define CONFIG_SYS_GPIO_DSPIC_READY 51
|
||||
#define CONFIG_SYS_GPIO_CAN_ENABLE 53
|
||||
#define CONFIG_SYS_GPIO_LSB_ENABLE 54
|
||||
|
|
@ -577,6 +578,13 @@
|
|||
#define CONFIG_SYS_GPIO_SYSMON_STATUS 62
|
||||
#define CONFIG_SYS_GPIO_WATCHDOG 63
|
||||
|
||||
/* On LCD4, GPIO49 has to be configured to 0 instead of 1 */
|
||||
#ifdef CONFIG_LCD4_LWMON5
|
||||
#define GPIO49_VAL 0
|
||||
#else
|
||||
#define GPIO49_VAL 1
|
||||
#endif
|
||||
|
||||
/*
|
||||
* PPC440 GPIO Configuration
|
||||
*/
|
||||
|
|
@ -635,7 +643,7 @@
|
|||
{GPIO1_BASE, GPIO_IN , GPIO_ALT1, GPIO_OUT_0}, /* GPIO46 UIC_IRQ(7) DMA_REQ(0) */ \
|
||||
{GPIO1_BASE, GPIO_IN , GPIO_ALT1, GPIO_OUT_0}, /* GPIO47 UIC_IRQ(8) DMA_ACK(0) */ \
|
||||
{GPIO1_BASE, GPIO_IN , GPIO_ALT1, GPIO_OUT_0}, /* GPIO48 UIC_IRQ(9) DMA_EOT/TC(0) */ \
|
||||
{GPIO1_BASE, GPIO_OUT, GPIO_SEL , GPIO_OUT_1}, /* GPIO49 Unselect via TraceSelect Bit */ \
|
||||
{GPIO1_BASE, GPIO_OUT, GPIO_SEL , GPIO49_VAL}, /* GPIO49 Unselect via TraceSelect Bit */ \
|
||||
{GPIO1_BASE, GPIO_IN, GPIO_SEL , GPIO_OUT_0}, /* GPIO50 Unselect via TraceSelect Bit */ \
|
||||
{GPIO1_BASE, GPIO_IN , GPIO_SEL , GPIO_OUT_0}, /* GPIO51 Unselect via TraceSelect Bit */ \
|
||||
{GPIO1_BASE, GPIO_IN , GPIO_SEL , GPIO_OUT_0}, /* GPIO52 Unselect via TraceSelect Bit */ \
|
||||
|
|
|
|||
|
|
@ -29,6 +29,9 @@
|
|||
/* DRAM Base */
|
||||
#define CONFIG_SYS_SDRAM_BASE 0x30000000
|
||||
|
||||
/* Text Base */
|
||||
#define CONFIG_SYS_TEXT_BASE 0x34800000
|
||||
|
||||
#define CONFIG_SETUP_MEMORY_TAGS
|
||||
#define CONFIG_CMDLINE_TAG
|
||||
#define CONFIG_INITRD_TAG
|
||||
|
|
|
|||
|
|
@ -109,4 +109,9 @@
|
|||
"stdout=serial\0" \
|
||||
"stderr=serial\0"
|
||||
|
||||
#define CONFIG_GZIP_COMPRESSED
|
||||
#define CONFIG_BZIP2
|
||||
#define CONFIG_LZO
|
||||
#define CONFIG_LZMA
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -34,6 +34,9 @@
|
|||
/* DRAM Base */
|
||||
#define CONFIG_SYS_SDRAM_BASE 0x30000000
|
||||
|
||||
/* Text Base */
|
||||
#define CONFIG_SYS_TEXT_BASE 0x34800000
|
||||
|
||||
#define CONFIG_SETUP_MEMORY_TAGS
|
||||
#define CONFIG_CMDLINE_TAG
|
||||
#define CONFIG_INITRD_TAG
|
||||
|
|
|
|||
|
|
@ -50,7 +50,9 @@
|
|||
#endif
|
||||
|
||||
#define __deprecated __attribute__((deprecated))
|
||||
#define __packed __attribute__((packed))
|
||||
#ifndef __packed
|
||||
# define __packed __attribute__((packed))
|
||||
#endif
|
||||
#define __weak __attribute__((weak))
|
||||
|
||||
/*
|
||||
|
|
@ -73,8 +75,12 @@
|
|||
* would be.
|
||||
* [...]
|
||||
*/
|
||||
#define __pure __attribute__((pure))
|
||||
#define __aligned(x) __attribute__((aligned(x)))
|
||||
#ifndef __pure
|
||||
# define __pure __attribute__((pure))
|
||||
#endif
|
||||
#ifndef __aligned
|
||||
# define __aligned(x) __attribute__((aligned(x)))
|
||||
#endif
|
||||
#define __printf(a,b) __attribute__((format(printf,a,b)))
|
||||
#define noinline __attribute__((noinline))
|
||||
#define __attribute_const__ __attribute__((__const__))
|
||||
|
|
|
|||
|
|
@ -12,7 +12,9 @@
|
|||
#define __used __attribute__((__used__))
|
||||
#define __must_check __attribute__((warn_unused_result))
|
||||
#define __compiler_offsetof(a,b) __builtin_offsetof(a,b)
|
||||
#define __always_inline inline __attribute__((always_inline))
|
||||
#ifndef __always_inline
|
||||
# define __always_inline inline __attribute__((always_inline))
|
||||
#endif
|
||||
|
||||
/*
|
||||
* A trick to suppress uninitialized variable warning without generating any
|
||||
|
|
|
|||
|
|
@ -139,6 +139,32 @@ enum {
|
|||
EN_LDO = (0x3 << 6),
|
||||
};
|
||||
|
||||
enum {
|
||||
OPMODE_OFF = 0,
|
||||
OPMODE_STANDBY,
|
||||
OPMODE_LPM,
|
||||
OPMODE_ON,
|
||||
};
|
||||
|
||||
int max77686_set_ldo_voltage(struct pmic *p, int ldo, ulong uV);
|
||||
int max77686_set_ldo_mode(struct pmic *p, int ldo, char opmode);
|
||||
int max77686_set_buck_mode(struct pmic *p, int buck, char opmode);
|
||||
|
||||
#define MAX77686_LDO_VOLT_MAX_HEX 0x3f
|
||||
#define MAX77686_LDO_VOLT_MASK 0x3f
|
||||
#define MAX77686_LDO_MODE_MASK 0xc0
|
||||
#define MAX77686_LDO_MODE_OFF (0x00 << 0x06)
|
||||
#define MAX77686_LDO_MODE_STANDBY (0x01 << 0x06)
|
||||
#define MAX77686_LDO_MODE_LPM (0x02 << 0x06)
|
||||
#define MAX77686_LDO_MODE_ON (0x03 << 0x06)
|
||||
#define MAX77686_BUCK_MODE_MASK 0x03
|
||||
#define MAX77686_BUCK_MODE_SHIFT_1 0x00
|
||||
#define MAX77686_BUCK_MODE_SHIFT_2 0x04
|
||||
#define MAX77686_BUCK_MODE_OFF 0x00
|
||||
#define MAX77686_BUCK_MODE_STANDBY 0x01
|
||||
#define MAX77686_BUCK_MODE_LPM 0x02
|
||||
#define MAX77686_BUCK_MODE_ON 0x03
|
||||
|
||||
/* Buck1 1 volt value */
|
||||
#define MAX77686_BUCK1OUT_1V 0x5
|
||||
/* Buck1 1.05 volt value */
|
||||
|
|
|
|||
|
|
@ -89,13 +89,13 @@ int zunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp,
|
|||
s.avail_out = dstlen;
|
||||
do {
|
||||
r = inflate(&s, Z_FINISH);
|
||||
if (r != Z_STREAM_END && r != Z_BUF_ERROR && stoponerr == 1) {
|
||||
if (stoponerr == 1 && r != Z_STREAM_END &&
|
||||
(s.avail_out == 0 || r != Z_BUF_ERROR)) {
|
||||
printf("Error: inflate() returned %d\n", r);
|
||||
inflateEnd(&s);
|
||||
return -1;
|
||||
}
|
||||
s.avail_in = *lenp - offset - (int)(s.next_out - (unsigned char*)dst);
|
||||
s.avail_out = dstlen;
|
||||
} while (r == Z_BUF_ERROR);
|
||||
*lenp = s.next_out - (unsigned char *) dst;
|
||||
inflateEnd(&s);
|
||||
|
|
|
|||
|
|
@ -97,15 +97,19 @@ int lzmaBuffToBuffDecompress (unsigned char *outStream, SizeT *uncompressedSize,
|
|||
g_Alloc.Alloc = SzAlloc;
|
||||
g_Alloc.Free = SzFree;
|
||||
|
||||
/* Short-circuit early if we know the buffer can't hold the results. */
|
||||
if (outSizeFull != (SizeT)-1 && *uncompressedSize < outSizeFull)
|
||||
return SZ_ERROR_OUTPUT_EOF;
|
||||
|
||||
/* Decompress */
|
||||
outProcessed = outSizeFull;
|
||||
outProcessed = *uncompressedSize;
|
||||
|
||||
WATCHDOG_RESET();
|
||||
|
||||
res = LzmaDecode(
|
||||
outStream, &outProcessed,
|
||||
inStream + LZMA_DATA_OFFSET, &compressedSize,
|
||||
inStream, LZMA_PROPS_SIZE, LZMA_FINISH_ANY, &state, &g_Alloc);
|
||||
inStream, LZMA_PROPS_SIZE, LZMA_FINISH_END, &state, &g_Alloc);
|
||||
*uncompressedSize = outProcessed;
|
||||
if (res != SZ_OK) {
|
||||
return res;
|
||||
|
|
|
|||
|
|
@ -68,13 +68,14 @@ int lzop_decompress(const unsigned char *src, size_t src_len,
|
|||
unsigned char *start = dst;
|
||||
const unsigned char *send = src + src_len;
|
||||
u32 slen, dlen;
|
||||
size_t tmp;
|
||||
size_t tmp, remaining;
|
||||
int r;
|
||||
|
||||
src = parse_header(src);
|
||||
if (!src)
|
||||
return LZO_E_ERROR;
|
||||
|
||||
remaining = *dst_len;
|
||||
while (src < send) {
|
||||
/* read uncompressed block size */
|
||||
dlen = get_unaligned_be32(src);
|
||||
|
|
@ -93,6 +94,10 @@ int lzop_decompress(const unsigned char *src, size_t src_len,
|
|||
if (slen <= 0 || slen > dlen)
|
||||
return LZO_E_ERROR;
|
||||
|
||||
/* abort if buffer ran out of room */
|
||||
if (dlen > remaining)
|
||||
return LZO_E_OUTPUT_OVERRUN;
|
||||
|
||||
/* decompress */
|
||||
tmp = dlen;
|
||||
r = lzo1x_decompress_safe((u8 *) src, slen, dst, &tmp);
|
||||
|
|
@ -105,6 +110,7 @@ int lzop_decompress(const unsigned char *src, size_t src_len,
|
|||
|
||||
src += slen;
|
||||
dst += dlen;
|
||||
remaining -= dlen;
|
||||
}
|
||||
|
||||
return LZO_E_INPUT_OVERRUN;
|
||||
|
|
|
|||
31
mkconfig
31
mkconfig
|
|
@ -23,10 +23,11 @@ options=""
|
|||
|
||||
if [ \( $# -eq 2 \) -a \( "$1" = "-A" \) ] ; then
|
||||
# Automatic mode
|
||||
line=`egrep -i "^[[:space:]]*${2}[[:space:]]" boards.cfg` || {
|
||||
line=`awk '($0 !~ /^#/ && $7 ~ /^'"$2"'$/) { print $1, $2, $3, $4, $5, $6, $7, $8 }' boards.cfg`
|
||||
if [ -z "$line" ] ; then
|
||||
echo "make: *** No rule to make target \`$2_config'. Stop." >&2
|
||||
exit 1
|
||||
}
|
||||
fi
|
||||
|
||||
set ${line}
|
||||
# add default board name if needed
|
||||
|
|
@ -37,44 +38,44 @@ while [ $# -gt 0 ] ; do
|
|||
case "$1" in
|
||||
--) shift ; break ;;
|
||||
-a) shift ; APPEND=yes ;;
|
||||
-n) shift ; BOARD_NAME="${1%_config}" ; shift ;;
|
||||
-n) shift ; BOARD_NAME="${7%_config}" ; shift ;;
|
||||
-t) shift ; TARGETS="`echo $1 | sed 's:_: :g'` ${TARGETS}" ; shift ;;
|
||||
*) break ;;
|
||||
esac
|
||||
done
|
||||
|
||||
[ $# -lt 4 ] && exit 1
|
||||
[ $# -gt 7 ] && exit 1
|
||||
[ $# -lt 7 ] && exit 1
|
||||
[ $# -gt 8 ] && exit 1
|
||||
|
||||
# Strip all options and/or _config suffixes
|
||||
CONFIG_NAME="${1%_config}"
|
||||
CONFIG_NAME="${7%_config}"
|
||||
|
||||
[ "${BOARD_NAME}" ] || BOARD_NAME="${1%_config}"
|
||||
[ "${BOARD_NAME}" ] || BOARD_NAME="${7%_config}"
|
||||
|
||||
arch="$2"
|
||||
cpu=`echo $3 | awk 'BEGIN {FS = ":"} ; {print $1}'`
|
||||
spl_cpu=`echo $3 | awk 'BEGIN {FS = ":"} ; {print $2}'`
|
||||
if [ "$4" = "-" ] ; then
|
||||
if [ "$6" = "-" ] ; then
|
||||
board=${BOARD_NAME}
|
||||
else
|
||||
board="$4"
|
||||
board="$6"
|
||||
fi
|
||||
[ $# -gt 4 ] && [ "$5" != "-" ] && vendor="$5"
|
||||
[ $# -gt 5 ] && [ "$6" != "-" ] && soc="$6"
|
||||
[ $# -gt 6 ] && [ "$7" != "-" ] && {
|
||||
[ "$5" != "-" ] && vendor="$5"
|
||||
[ "$4" != "-" ] && soc="$4"
|
||||
[ $# -gt 7 ] && [ "$8" != "-" ] && {
|
||||
# check if we have a board config name in the options field
|
||||
# the options field mave have a board config name and a list
|
||||
# of options, both separated by a colon (':'); the options are
|
||||
# separated by commas (',').
|
||||
#
|
||||
# Check for board name
|
||||
tmp="${7%:*}"
|
||||
tmp="${8%:*}"
|
||||
if [ "$tmp" ] ; then
|
||||
CONFIG_NAME="$tmp"
|
||||
fi
|
||||
# Check if we only have a colon...
|
||||
if [ "${tmp}" != "$7" ] ; then
|
||||
options=${7#*:}
|
||||
if [ "${tmp}" != "$8" ] ; then
|
||||
options=${8#*:}
|
||||
TARGETS="`echo ${options} | sed 's:,: :g'` ${TARGETS}"
|
||||
fi
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ include $(TOPDIR)/config.mk
|
|||
LIB = $(obj)libtest.o
|
||||
|
||||
COBJS-$(CONFIG_SANDBOX) += command_ut.o
|
||||
COBJS-$(CONFIG_SANDBOX) += compression.o
|
||||
|
||||
COBJS := $(sort $(COBJS-y))
|
||||
SRCS := $(COBJS:.o=.c)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,335 @@
|
|||
/*
|
||||
* Copyright (c) 2013, The Chromium Authors
|
||||
*
|
||||
* SPDX-License-Identifier: GPL-2.0+
|
||||
*/
|
||||
|
||||
#define DEBUG
|
||||
|
||||
#include <common.h>
|
||||
#include <command.h>
|
||||
#include <malloc.h>
|
||||
|
||||
#include <u-boot/zlib.h>
|
||||
#include <bzlib.h>
|
||||
|
||||
#include <lzma/LzmaTypes.h>
|
||||
#include <lzma/LzmaDec.h>
|
||||
#include <lzma/LzmaTools.h>
|
||||
|
||||
#include <linux/lzo.h>
|
||||
|
||||
static const char plain[] =
|
||||
"I am a highly compressable bit of text.\n"
|
||||
"I am a highly compressable bit of text.\n"
|
||||
"I am a highly compressable bit of text.\n"
|
||||
"There are many like me, but this one is mine.\n"
|
||||
"If I were any shorter, there wouldn't be much sense in\n"
|
||||
"compressing me in the first place. At least with lzo, anyway,\n"
|
||||
"which appears to behave poorly in the face of short text\n"
|
||||
"messages.\n";
|
||||
|
||||
/* bzip2 -c /tmp/plain.txt > /tmp/plain.bz2 */
|
||||
static const char bzip2_compressed[] =
|
||||
"\x42\x5a\x68\x39\x31\x41\x59\x26\x53\x59\xe5\x63\xdd\x09\x00\x00"
|
||||
"\x28\x57\x80\x00\x10\x40\x85\x20\x20\x04\x00\x3f\xef\xdf\xf0\x30"
|
||||
"\x00\xd6\xd0\x34\x91\x89\xa6\xf5\x4d\x19\x1a\x19\x0d\x02\x34\xd4"
|
||||
"\xc9\x00\x34\x34\x00\x02\x48\x41\x35\x4f\xd4\xc6\x88\xd3\x50\x3d"
|
||||
"\x4f\x51\x82\x4f\x88\xc3\x0d\x05\x62\x4f\x91\xa3\x52\x1b\xd0\x52"
|
||||
"\x41\x4a\xa3\x98\xc2\x6b\xca\xa3\x82\xa5\xac\x8b\x15\x99\x68\xad"
|
||||
"\xdf\x29\xd6\xf1\xf7\x5a\x10\xcd\x8c\x26\x61\x94\x95\xfe\x9e\x16"
|
||||
"\x18\x28\x69\xd4\x23\x64\xcc\x2b\xe5\xe8\x5f\x00\xa4\x70\x26\x2c"
|
||||
"\xee\xbd\x59\x6d\x6a\xec\xfc\x31\xda\x59\x0a\x14\x2a\x60\x1c\xf0"
|
||||
"\x04\x86\x73\x9a\xc5\x5b\x87\x3f\x5b\x4c\x93\xe6\xb5\x35\x0d\xa6"
|
||||
"\xb1\x2e\x62\x7b\xab\x67\xe7\x99\x2a\x14\x5e\x9f\x64\xcb\x96\xf4"
|
||||
"\x0d\x65\xd4\x39\xe6\x8b\x7e\xea\x1c\x03\x69\x97\x83\x58\x91\x96"
|
||||
"\xe1\xf0\x9d\xa4\x15\x8b\xb8\xc6\x93\xdc\x3d\xd9\x3c\x22\x55\xef"
|
||||
"\xfb\xbb\x2a\xd3\x87\xa2\x8b\x04\xd9\x19\xf8\xe2\xfd\x4f\xdb\x1a"
|
||||
"\x07\xc8\x60\xa3\x3f\xf8\xbb\x92\x29\xc2\x84\x87\x2b\x1e\xe8\x48";
|
||||
static const unsigned long bzip2_compressed_size = 240;
|
||||
|
||||
/* lzma -z -c /tmp/plain.txt > /tmp/plain.lzma */
|
||||
static const char lzma_compressed[] =
|
||||
"\x5d\x00\x00\x80\x00\xff\xff\xff\xff\xff\xff\xff\xff\x00\x24\x88"
|
||||
"\x08\x26\xd8\x41\xff\x99\xc8\xcf\x66\x3d\x80\xac\xba\x17\xf1\xc8"
|
||||
"\xb9\xdf\x49\x37\xb1\x68\xa0\x2a\xdd\x63\xd1\xa7\xa3\x66\xf8\x15"
|
||||
"\xef\xa6\x67\x8a\x14\x18\x80\xcb\xc7\xb1\xcb\x84\x6a\xb2\x51\x16"
|
||||
"\xa1\x45\xa0\xd6\x3e\x55\x44\x8a\x5c\xa0\x7c\xe5\xa8\xbd\x04\x57"
|
||||
"\x8f\x24\xfd\xb9\x34\x50\x83\x2f\xf3\x46\x3e\xb9\xb0\x00\x1a\xf5"
|
||||
"\xd3\x86\x7e\x8f\x77\xd1\x5d\x0e\x7c\xe1\xac\xde\xf8\x65\x1f\x4d"
|
||||
"\xce\x7f\xa7\x3d\xaa\xcf\x26\xa7\x58\x69\x1e\x4c\xea\x68\x8a\xe5"
|
||||
"\x89\xd1\xdc\x4d\xc7\xe0\x07\x42\xbf\x0c\x9d\x06\xd7\x51\xa2\x0b"
|
||||
"\x7c\x83\x35\xe1\x85\xdf\xee\xfb\xa3\xee\x2f\x47\x5f\x8b\x70\x2b"
|
||||
"\xe1\x37\xf3\x16\xf6\x27\x54\x8a\x33\x72\x49\xea\x53\x7d\x60\x0b"
|
||||
"\x21\x90\x66\xe7\x9e\x56\x61\x5d\xd8\xdc\x59\xf0\xac\x2f\xd6\x49"
|
||||
"\x6b\x85\x40\x08\x1f\xdf\x26\x25\x3b\x72\x44\xb0\xb8\x21\x2f\xb3"
|
||||
"\xd7\x9b\x24\x30\x78\x26\x44\x07\xc3\x33\xd1\x4d\x03\x1b\xe1\xff"
|
||||
"\xfd\xf5\x50\x8d\xca";
|
||||
static const unsigned long lzma_compressed_size = 229;
|
||||
|
||||
/* lzop -c /tmp/plain.txt > /tmp/plain.lzo */
|
||||
static const char lzo_compressed[] =
|
||||
"\x89\x4c\x5a\x4f\x00\x0d\x0a\x1a\x0a\x10\x30\x20\x60\x09\x40\x01"
|
||||
"\x05\x03\x00\x00\x09\x00\x00\x81\xb4\x52\x09\x54\xf1\x00\x00\x00"
|
||||
"\x00\x09\x70\x6c\x61\x69\x6e\x2e\x74\x78\x74\x65\xb1\x07\x9c\x00"
|
||||
"\x00\x01\x5e\x00\x00\x01\x0f\xc3\xc7\x7a\xe0\x00\x16\x49\x20\x61"
|
||||
"\x6d\x20\x61\x20\x68\x69\x67\x68\x6c\x79\x20\x63\x6f\x6d\x70\x72"
|
||||
"\x65\x73\x73\x61\x62\x6c\x65\x20\x62\x69\x74\x20\x6f\x66\x20\x74"
|
||||
"\x65\x78\x74\x2e\x0a\x20\x2f\x9c\x00\x00\x22\x54\x68\x65\x72\x65"
|
||||
"\x20\x61\x72\x65\x20\x6d\x61\x6e\x79\x20\x6c\x69\x6b\x65\x20\x6d"
|
||||
"\x65\x2c\x20\x62\x75\x74\x20\x74\x68\x69\x73\x20\x6f\x6e\x65\x20"
|
||||
"\x69\x73\x20\x6d\x69\x6e\x65\x2e\x0a\x49\x66\x20\x49\x20\x77\x84"
|
||||
"\x06\x0a\x6e\x79\x20\x73\x68\x6f\x72\x74\x65\x72\x2c\x20\x74\x90"
|
||||
"\x08\x00\x08\x77\x6f\x75\x6c\x64\x6e\x27\x74\x20\x62\x65\x20\x6d"
|
||||
"\x75\x63\x68\x20\x73\x65\x6e\x73\x65\x20\x69\x6e\x0a\xf8\x19\x02"
|
||||
"\x69\x6e\x67\x20\x6d\x64\x02\x64\x06\x00\x5a\x20\x66\x69\x72\x73"
|
||||
"\x74\x20\x70\x6c\x61\x63\x65\x2e\x20\x41\x74\x20\x6c\x65\x61\x73"
|
||||
"\x74\x20\x77\x69\x74\x68\x20\x6c\x7a\x6f\x2c\x20\x61\x6e\x79\x77"
|
||||
"\x61\x79\x2c\x0a\x77\x68\x69\x63\x68\x20\x61\x70\x70\x65\x61\x72"
|
||||
"\x73\x20\x74\x6f\x20\x62\x65\x68\x61\x76\x65\x20\x70\x6f\x6f\x72"
|
||||
"\x6c\x79\x20\x69\x6e\x20\x74\x68\x65\x20\x66\x61\x63\x65\x20\x6f"
|
||||
"\x66\x20\x73\x68\x6f\x72\x74\x20\x74\x65\x78\x74\x0a\x6d\x65\x73"
|
||||
"\x73\x61\x67\x65\x73\x2e\x0a\x11\x00\x00\x00\x00\x00\x00";
|
||||
static const unsigned long lzo_compressed_size = 334;
|
||||
|
||||
|
||||
#define TEST_BUFFER_SIZE 512
|
||||
|
||||
typedef int (*mutate_func)(void *, unsigned long, void *, unsigned long,
|
||||
unsigned long *);
|
||||
|
||||
static int compress_using_gzip(void *in, unsigned long in_size,
|
||||
void *out, unsigned long out_max,
|
||||
unsigned long *out_size)
|
||||
{
|
||||
int ret;
|
||||
unsigned long inout_size = out_max;
|
||||
|
||||
ret = gzip(out, &inout_size, in, in_size);
|
||||
if (out_size)
|
||||
*out_size = inout_size;
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int uncompress_using_gzip(void *in, unsigned long in_size,
|
||||
void *out, unsigned long out_max,
|
||||
unsigned long *out_size)
|
||||
{
|
||||
int ret;
|
||||
unsigned long inout_size = in_size;
|
||||
|
||||
ret = gunzip(out, out_max, in, &inout_size);
|
||||
if (out_size)
|
||||
*out_size = inout_size;
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int compress_using_bzip2(void *in, unsigned long in_size,
|
||||
void *out, unsigned long out_max,
|
||||
unsigned long *out_size)
|
||||
{
|
||||
/* There is no bzip2 compression in u-boot, so fake it. */
|
||||
assert(in_size == strlen(plain));
|
||||
assert(memcmp(plain, in, in_size) == 0);
|
||||
|
||||
if (bzip2_compressed_size > out_max)
|
||||
return -1;
|
||||
|
||||
memcpy(out, bzip2_compressed, bzip2_compressed_size);
|
||||
if (out_size)
|
||||
*out_size = bzip2_compressed_size;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int uncompress_using_bzip2(void *in, unsigned long in_size,
|
||||
void *out, unsigned long out_max,
|
||||
unsigned long *out_size)
|
||||
{
|
||||
int ret;
|
||||
unsigned int inout_size = out_max;
|
||||
|
||||
ret = BZ2_bzBuffToBuffDecompress(out, &inout_size, in, in_size,
|
||||
CONFIG_SYS_MALLOC_LEN < (4096 * 1024), 0);
|
||||
if (out_size)
|
||||
*out_size = inout_size;
|
||||
|
||||
return (ret != BZ_OK);
|
||||
}
|
||||
|
||||
static int compress_using_lzma(void *in, unsigned long in_size,
|
||||
void *out, unsigned long out_max,
|
||||
unsigned long *out_size)
|
||||
{
|
||||
/* There is no lzma compression in u-boot, so fake it. */
|
||||
assert(in_size == strlen(plain));
|
||||
assert(memcmp(plain, in, in_size) == 0);
|
||||
|
||||
if (lzma_compressed_size > out_max)
|
||||
return -1;
|
||||
|
||||
memcpy(out, lzma_compressed, lzma_compressed_size);
|
||||
if (out_size)
|
||||
*out_size = lzma_compressed_size;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int uncompress_using_lzma(void *in, unsigned long in_size,
|
||||
void *out, unsigned long out_max,
|
||||
unsigned long *out_size)
|
||||
{
|
||||
int ret;
|
||||
SizeT inout_size = out_max;
|
||||
|
||||
ret = lzmaBuffToBuffDecompress(out, &inout_size, in, in_size);
|
||||
if (out_size)
|
||||
*out_size = inout_size;
|
||||
|
||||
return (ret != SZ_OK);
|
||||
}
|
||||
|
||||
static int compress_using_lzo(void *in, unsigned long in_size,
|
||||
void *out, unsigned long out_max,
|
||||
unsigned long *out_size)
|
||||
{
|
||||
/* There is no lzo compression in u-boot, so fake it. */
|
||||
assert(in_size == strlen(plain));
|
||||
assert(memcmp(plain, in, in_size) == 0);
|
||||
|
||||
if (lzo_compressed_size > out_max)
|
||||
return -1;
|
||||
|
||||
memcpy(out, lzo_compressed, lzo_compressed_size);
|
||||
if (out_size)
|
||||
*out_size = lzo_compressed_size;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int uncompress_using_lzo(void *in, unsigned long in_size,
|
||||
void *out, unsigned long out_max,
|
||||
unsigned long *out_size)
|
||||
{
|
||||
int ret;
|
||||
size_t input_size = in_size;
|
||||
size_t output_size = out_max;
|
||||
|
||||
ret = lzop_decompress(in, input_size, out, &output_size);
|
||||
if (out_size)
|
||||
*out_size = output_size;
|
||||
|
||||
return (ret != LZO_E_OK);
|
||||
}
|
||||
|
||||
#define errcheck(statement) if (!(statement)) { \
|
||||
fprintf(stderr, "\tFailed: %s\n", #statement); \
|
||||
ret = 1; \
|
||||
goto out; \
|
||||
}
|
||||
|
||||
static int run_test(char *name, mutate_func compress, mutate_func uncompress)
|
||||
{
|
||||
ulong orig_size, compressed_size, uncompressed_size;
|
||||
void *orig_buf;
|
||||
void *compressed_buf = NULL;
|
||||
void *uncompressed_buf = NULL;
|
||||
void *compare_buf = NULL;
|
||||
int ret;
|
||||
|
||||
printf(" testing %s ...\n", name);
|
||||
|
||||
orig_buf = (void *)plain;
|
||||
orig_size = strlen(orig_buf); /* Trailing NULL not included. */
|
||||
errcheck(orig_size > 0);
|
||||
|
||||
compressed_size = uncompressed_size = TEST_BUFFER_SIZE;
|
||||
compressed_buf = malloc(compressed_size);
|
||||
errcheck(compressed_buf != NULL);
|
||||
uncompressed_buf = malloc(uncompressed_size);
|
||||
errcheck(uncompressed_buf != NULL);
|
||||
compare_buf = malloc(uncompressed_size);
|
||||
errcheck(compare_buf != NULL);
|
||||
|
||||
/* Compress works as expected. */
|
||||
printf("\torig_size:%lu\n", orig_size);
|
||||
memset(compressed_buf, 'A', TEST_BUFFER_SIZE);
|
||||
errcheck(compress(orig_buf, orig_size,
|
||||
compressed_buf, compressed_size,
|
||||
&compressed_size) == 0);
|
||||
printf("\tcompressed_size:%lu\n", compressed_size);
|
||||
errcheck(compressed_size > 0);
|
||||
errcheck(compressed_size < orig_size);
|
||||
errcheck(((char *)compressed_buf)[compressed_size-1] != 'A');
|
||||
errcheck(((char *)compressed_buf)[compressed_size] == 'A');
|
||||
|
||||
/* Uncompresses with space remaining. */
|
||||
errcheck(uncompress(compressed_buf, compressed_size,
|
||||
uncompressed_buf, uncompressed_size,
|
||||
&uncompressed_size) == 0);
|
||||
printf("\tuncompressed_size:%lu\n", uncompressed_size);
|
||||
errcheck(uncompressed_size == orig_size);
|
||||
errcheck(memcmp(orig_buf, uncompressed_buf, orig_size) == 0);
|
||||
|
||||
/* Uncompresses with exactly the right size output buffer. */
|
||||
memset(uncompressed_buf, 'A', TEST_BUFFER_SIZE);
|
||||
errcheck(uncompress(compressed_buf, compressed_size,
|
||||
uncompressed_buf, orig_size,
|
||||
&uncompressed_size) == 0);
|
||||
errcheck(uncompressed_size == orig_size);
|
||||
errcheck(memcmp(orig_buf, uncompressed_buf, orig_size) == 0);
|
||||
errcheck(((char *)uncompressed_buf)[orig_size] == 'A');
|
||||
|
||||
/* Make sure compression does not over-run. */
|
||||
memset(compare_buf, 'A', TEST_BUFFER_SIZE);
|
||||
ret = compress(orig_buf, orig_size,
|
||||
compare_buf, compressed_size - 1,
|
||||
NULL);
|
||||
errcheck(((char *)compare_buf)[compressed_size] == 'A');
|
||||
errcheck(ret != 0);
|
||||
printf("\tcompress does not overrun\n");
|
||||
|
||||
/* Make sure decompression does not over-run. */
|
||||
memset(compare_buf, 'A', TEST_BUFFER_SIZE);
|
||||
ret = uncompress(compressed_buf, compressed_size,
|
||||
compare_buf, uncompressed_size - 1,
|
||||
NULL);
|
||||
errcheck(((char *)compare_buf)[uncompressed_size - 1] == 'A');
|
||||
errcheck(ret != 0);
|
||||
printf("\tuncompress does not overrun\n");
|
||||
|
||||
/* Got here, everything is fine. */
|
||||
ret = 0;
|
||||
|
||||
out:
|
||||
printf(" %s: %s\n", name, ret == 0 ? "ok" : "FAILED");
|
||||
|
||||
free(compare_buf);
|
||||
free(uncompressed_buf);
|
||||
free(compressed_buf);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
static int do_test_compression(cmd_tbl_t *cmdtp, int flag, int argc,
|
||||
char * const argv[])
|
||||
{
|
||||
int err = 0;
|
||||
|
||||
err += run_test("gzip", compress_using_gzip, uncompress_using_gzip);
|
||||
err += run_test("bzip2", compress_using_bzip2, uncompress_using_bzip2);
|
||||
err += run_test("lzma", compress_using_lzma, uncompress_using_lzma);
|
||||
err += run_test("lzo", compress_using_lzo, uncompress_using_lzo);
|
||||
|
||||
printf("test_compression %s\n", err == 0 ? "ok" : "FAILED");
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
U_BOOT_CMD(
|
||||
test_compression, 5, 1, do_test_compression,
|
||||
"Basic test of compressors: gzip bzip2 lzma lzo", ""
|
||||
);
|
||||
|
|
@ -52,7 +52,7 @@ BIN_FILES-$(CONFIG_CMD_LOADS) += img2srec$(SFX)
|
|||
BIN_FILES-$(CONFIG_XWAY_SWAP_BYTES) += xway-swap-bytes$(SFX)
|
||||
BIN_FILES-y += mkenvimage$(SFX)
|
||||
BIN_FILES-y += mkimage$(SFX)
|
||||
BIN_FILES-$(CONFIG_SMDK5250) += mksmdk5250spl$(SFX)
|
||||
BIN_FILES-$(CONFIG_EXYNOS5250) += mk$(BOARD)spl$(SFX)
|
||||
BIN_FILES-$(CONFIG_MX23) += mxsboot$(SFX)
|
||||
BIN_FILES-$(CONFIG_MX28) += mxsboot$(SFX)
|
||||
BIN_FILES-$(CONFIG_NETCONSOLE) += ncb$(SFX)
|
||||
|
|
@ -87,6 +87,7 @@ NOPED_OBJ_FILES-y += ublimage.o
|
|||
OBJ_FILES-$(CONFIG_BUILD_ENVCRC) += envcrc.o
|
||||
OBJ_FILES-$(CONFIG_CMD_LOADS) += img2srec.o
|
||||
OBJ_FILES-$(CONFIG_CMD_NET) += gen_eth_addr.o
|
||||
OBJ_FILES-$(CONFIG_EXYNOS5250) += mkexynosspl.o
|
||||
OBJ_FILES-$(CONFIG_KIRKWOOD) += kwboot.o
|
||||
OBJ_FILES-$(CONFIG_LCD_LOGO) += bmp_logo.o
|
||||
OBJ_FILES-$(CONFIG_MX23) += mxsboot.o
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ class Boards:
|
|||
for upto in range(len(fields)):
|
||||
if fields[upto] == '-':
|
||||
fields[upto] = ''
|
||||
while len(fields) < 7:
|
||||
while len(fields) < 9:
|
||||
fields.append('')
|
||||
|
||||
board = Board(*fields)
|
||||
|
|
|
|||
|
|
@ -727,27 +727,39 @@ static int flash_write_buf (int dev, int fd, void *buf, size_t count,
|
|||
MEMGETBADBLOCK needs 64 bits */
|
||||
int rc;
|
||||
|
||||
blocklen = DEVESIZE (dev);
|
||||
|
||||
top_of_range = ((DEVOFFSET(dev) / blocklen) +
|
||||
ENVSECTORS (dev)) * blocklen;
|
||||
|
||||
erase_offset = (offset / blocklen) * blocklen;
|
||||
|
||||
/* Maximum area we may use */
|
||||
erase_len = top_of_range - erase_offset;
|
||||
|
||||
blockstart = erase_offset;
|
||||
/* Offset inside a block */
|
||||
block_seek = offset - erase_offset;
|
||||
|
||||
/*
|
||||
* Data size we actually have to write: from the start of the block
|
||||
* to the start of the data, then count bytes of data, and to the
|
||||
* end of the block
|
||||
* For mtd devices only offset and size of the environment do matter
|
||||
*/
|
||||
write_total = ((block_seek + count + blocklen - 1) /
|
||||
blocklen) * blocklen;
|
||||
if (mtd_type == MTD_ABSENT) {
|
||||
blocklen = count;
|
||||
top_of_range = offset + count;
|
||||
erase_len = blocklen;
|
||||
blockstart = offset;
|
||||
block_seek = 0;
|
||||
write_total = blocklen;
|
||||
} else {
|
||||
blocklen = DEVESIZE(dev);
|
||||
|
||||
top_of_range = ((DEVOFFSET(dev) / blocklen) +
|
||||
ENVSECTORS(dev)) * blocklen;
|
||||
|
||||
erase_offset = (offset / blocklen) * blocklen;
|
||||
|
||||
/* Maximum area we may use */
|
||||
erase_len = top_of_range - erase_offset;
|
||||
|
||||
blockstart = erase_offset;
|
||||
/* Offset inside a block */
|
||||
block_seek = offset - erase_offset;
|
||||
|
||||
/*
|
||||
* Data size we actually write: from the start of the block
|
||||
* to the start of the data, then count bytes of data, and
|
||||
* to the end of the block
|
||||
*/
|
||||
write_total = ((block_seek + count + blocklen - 1) /
|
||||
blocklen) * blocklen;
|
||||
}
|
||||
|
||||
/*
|
||||
* Support data anywhere within erase sectors: read out the complete
|
||||
|
|
@ -818,17 +830,18 @@ static int flash_write_buf (int dev, int fd, void *buf, size_t count,
|
|||
continue;
|
||||
}
|
||||
|
||||
erase.start = blockstart;
|
||||
ioctl (fd, MEMUNLOCK, &erase);
|
||||
/* These do not need an explicit erase cycle */
|
||||
if (mtd_type != MTD_ABSENT &&
|
||||
mtd_type != MTD_DATAFLASH)
|
||||
if (ioctl (fd, MEMERASE, &erase) != 0) {
|
||||
fprintf (stderr, "MTD erase error on %s: %s\n",
|
||||
DEVNAME (dev),
|
||||
strerror (errno));
|
||||
return -1;
|
||||
}
|
||||
if (mtd_type != MTD_ABSENT) {
|
||||
erase.start = blockstart;
|
||||
ioctl(fd, MEMUNLOCK, &erase);
|
||||
/* These do not need an explicit erase cycle */
|
||||
if (mtd_type != MTD_DATAFLASH)
|
||||
if (ioctl(fd, MEMERASE, &erase) != 0) {
|
||||
fprintf(stderr,
|
||||
"MTD erase error on %s: %s\n",
|
||||
DEVNAME(dev), strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
if (lseek (fd, blockstart, SEEK_SET) == -1) {
|
||||
fprintf (stderr,
|
||||
|
|
@ -847,7 +860,8 @@ static int flash_write_buf (int dev, int fd, void *buf, size_t count,
|
|||
return -1;
|
||||
}
|
||||
|
||||
ioctl (fd, MEMLOCK, &erase);
|
||||
if (mtd_type != MTD_ABSENT)
|
||||
ioctl(fd, MEMLOCK, &erase);
|
||||
|
||||
processed += blocklen;
|
||||
block_seek = 0;
|
||||
|
|
@ -1136,6 +1150,9 @@ int fw_env_open(void)
|
|||
} else if (DEVTYPE(dev_current) == MTD_UBIVOLUME &&
|
||||
DEVTYPE(!dev_current) == MTD_UBIVOLUME) {
|
||||
environment.flag_scheme = FLAG_INCREMENTAL;
|
||||
} else if (DEVTYPE(dev_current) == MTD_ABSENT &&
|
||||
DEVTYPE(!dev_current) == MTD_ABSENT) {
|
||||
environment.flag_scheme = FLAG_INCREMENTAL;
|
||||
} else {
|
||||
fprintf (stderr, "Incompatible flash types!\n");
|
||||
return -1;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,132 @@
|
|||
#! /usr/bin/python
|
||||
########################################################################
|
||||
#
|
||||
# reorder and reformat a file in columns
|
||||
#
|
||||
# this utility takes lines from its standard input and reproduces them,
|
||||
# partially reordered and reformatted, on its standard output.
|
||||
#
|
||||
# It has the same effect as a 'sort | column -t', with the exception
|
||||
# that empty lines, as well as lines which start with a '#' sign, are
|
||||
# not affected, i.e. they keep their position and formatting, and act
|
||||
# as separators, i.e. the parts before and after them are each sorted
|
||||
# separately (but overall field widths are computed across the whole
|
||||
# input).
|
||||
#
|
||||
# Options:
|
||||
# -i:
|
||||
# --ignore-case:
|
||||
# Do not consider case when sorting.
|
||||
# -d:
|
||||
# --default:
|
||||
# What to chage empty fields to.
|
||||
# -s <N>:
|
||||
# --split=<N>:
|
||||
# Treat only the first N whitespace sequences as separators.
|
||||
# line content after the Nth separator will count as only one
|
||||
# field even if it contains whitespace.
|
||||
# Example : '-s 2' causes input 'a b c d e' to be split into
|
||||
# three fields, 'a', 'b', and 'c d e'.
|
||||
#
|
||||
# boards.cfg requires -ids 6.
|
||||
#
|
||||
########################################################################
|
||||
|
||||
import sys, getopt, locale
|
||||
|
||||
# ensure we sort using the C locale.
|
||||
|
||||
locale.setlocale(locale.LC_ALL, 'C')
|
||||
|
||||
# check options
|
||||
|
||||
maxsplit = 0
|
||||
ignore_case = 0
|
||||
default_field =''
|
||||
|
||||
try:
|
||||
opts, args = getopt.getopt(sys.argv[1:], "id:s:",
|
||||
["ignore-case","default","split="])
|
||||
except getopt.GetoptError as err:
|
||||
print str(err) # will print something like "option -a not recognized"
|
||||
sys.exit(2)
|
||||
|
||||
for o, a in opts:
|
||||
if o in ("-s", "--split"):
|
||||
maxsplit = eval(a)
|
||||
elif o in ("-i", "--ignore-case"):
|
||||
ignore_case = 1
|
||||
elif o in ("-d", "--default"):
|
||||
default_field = a
|
||||
else:
|
||||
assert False, "unhandled option"
|
||||
|
||||
# collect all lines from standard input and, for the ones which must be
|
||||
# reformatted and sorted, count their fields and compute each field's
|
||||
# maximum size
|
||||
|
||||
input_lines = []
|
||||
field_width = []
|
||||
|
||||
for line in sys.stdin:
|
||||
# remove final end of line
|
||||
input_line = line.strip('\n')
|
||||
if (len(input_line)>0) and (input_line[0] != '#'):
|
||||
# sortable line: split into fields
|
||||
fields = input_line.split(None,maxsplit)
|
||||
# if there are new fields, top up field_widths
|
||||
for f in range(len(field_width), len(fields)):
|
||||
field_width.append(0)
|
||||
# compute the maximum witdh of each field
|
||||
for f in range(len(fields)):
|
||||
field_width[f] = max(field_width[f],len(fields[f]))
|
||||
# collect the line for next stage
|
||||
input_lines.append(input_line)
|
||||
|
||||
# run through collected input lines, collect the ones which must be
|
||||
# reformatted and sorted, and whenever a non-reformattable, non-sortable
|
||||
# line is met, sort the collected lines before it and append them to the
|
||||
# output lines, then add the non-sortable line too.
|
||||
|
||||
output_lines = []
|
||||
sortable_lines = []
|
||||
for input_line in input_lines:
|
||||
if (len(input_line)>0) and (input_line[0] != '#'):
|
||||
# this line should be reformatted and sorted
|
||||
input_fields = input_line.split(None,maxsplit)
|
||||
output_fields = [];
|
||||
# reformat each field to this field's column width
|
||||
for f in range(len(input_fields)):
|
||||
output_field = input_fields[f];
|
||||
output_fields.append(output_field.ljust(field_width[f]))
|
||||
# any missing field is set to default if it exists
|
||||
if default_field != '':
|
||||
for f in range(len(input_fields),len(field_width)):
|
||||
output_fields.append(default_field.ljust(field_width[f]))
|
||||
# join fields using two spaces, like column -t would
|
||||
output_line = ' '.join(output_fields);
|
||||
# collect line for later
|
||||
sortable_lines.append(output_line)
|
||||
else:
|
||||
# this line is non-sortable
|
||||
# sort collected sortable lines
|
||||
if ignore_case!=0:
|
||||
sortable_lines.sort(key=lambda x: str.lower(locale.strxfrm(x)))
|
||||
else:
|
||||
sortable_lines.sort(key=lambda x: locale.strxfrm(x))
|
||||
# append sortable lines to the final output
|
||||
output_lines.extend(sortable_lines)
|
||||
sortable_lines = []
|
||||
# append non-sortable line to the final output
|
||||
output_lines.append(input_line)
|
||||
# maybe we had sortable lines pending, so append them to the final output
|
||||
if ignore_case!=0:
|
||||
sortable_lines.sort(key=lambda x: str.lower(locale.strxfrm(x)))
|
||||
else:
|
||||
sortable_lines.sort(key=lambda x: locale.strxfrm(x))
|
||||
output_lines.extend(sortable_lines)
|
||||
|
||||
# run through output lines and print them, except rightmost whitespace
|
||||
|
||||
for output_line in output_lines:
|
||||
print output_line.rstrip()
|
||||
Loading…
Reference in New Issue