October 2013 - U-Boot

[U-Boot] [PATCH V2 0/6] Add support for SPI based DataImage LCD panel
by Nikita Kiryanov 12 Nov '13

12 Nov '13

This patch ports the Linux driver for DataImage SCF0403852GGU04 and SCF0403526GGU20 LCD panels into U-Boot. As a preparation step, variable SPI word length support is added to omap3_spi and the generic SPI interface. Finally, the driver is used in cm_t35 board. The SPI changes were tested with a Beagle I2C/SPI/MDIO Protocol Analyzer, and also with a DataImage SCF0403 lcd as part of the DataImage driver test. Patch number 6 depends on http://patchwork.ozlabs.org/patch/275283/ Cc: Tom Rini <trini(a)ti.com> Cc: Anatolij Gustschin <agust(a)denx.de> Cc: Igor Grinberg <grinberg(a)compulab.co.il> Cc: Jagannadha Sutradharudu Teki <jagannadh.teki(a)gmail.com> Changes in V2: - Rebased on top of latest U-Boot - New patches: 1) spi: omap3: remove semicolon from #define 2) spi: define SPI_XFER_ONCE 3) omap3_dss: define DSS_ONOFF 1 is a preliminary cleanup suggested by Gerhard Sittig and Igor Grinberg 2 and 3 are splitting off some new #defines to separate patches - Moved wordlen to generic spi_slave struct, and added generic implementation for spi_set_wordlen which only updates the struct without touching the hardware (Igor Grinberg) - Updated wordlen in hardware just before doing SPI transactions, not when changing wordlen (Igor Grinberg) - OMAP3 specific check of wordlen value from old implementation of spi_set_wordlen moved to xfer. It refines the more general check done in the new spi_set_wordlen. - Fixed comment style in spi.h following a rebase on top of latest U-Boot - Added SPDX-License-Identifier to all new files (Anatolij Gustschin) - s/printf/puts for not formatted strings in scf0403 driver (Anatolij Gustschin) - Do not fail scf0403 driver init if an invalid reset_gpio is given (Igor Grinberg) Nikita Kiryanov (6): spi: omap3: remove semicolon from #define spi: omap3: add support for more word lengths spi: define SPI_XFER_ONCE lcd: add DataImage SCF0403x LCD panel support omap3_dss: define DSS_ONOFF cm_t35: use scf0403 driver arch/arm/include/asm/arch-omap3/dss.h | 9 +- board/compulab/cm_t35/cm_t35.c | 12 ++ board/compulab/common/omap3_display.c | 46 +++++- drivers/spi/omap3_spi.c | 71 +++++--- drivers/spi/omap3_spi.h | 8 +- drivers/spi/spi.c | 13 ++ drivers/video/Makefile | 1 + drivers/video/scf0403_lcd.c | 296 ++++++++++++++++++++++++++++++++++ include/configs/cm_t35.h | 3 + include/scf0403_lcd.h | 11 ++ include/spi.h | 17 ++ 11 files changed, 456 insertions(+), 31 deletions(-) create mode 100644 drivers/video/scf0403_lcd.c create mode 100644 include/scf0403_lcd.h -- 1.8.1.2

3 18

[U-Boot] [PATCH 2/2] video: bcm2835: fix various output modes
by Andre Heider 12 Nov '13

12 Nov '13

Depending on the firmware's video options [1] the active SDTV or HDTV mode can yield a framebuffer with noncontiguous horizontal lines, giving a messed up display, for both, u-boot and the loaded kernel. To always archive the required contiguousness for the used 16bpp, round the framebuffer width down so its aligned to a width of 16. [1] http://elinux.org/RPiconfig#Video_mode_options Signed-off-by: Andre Heider <a.heider(a)gmail.com> --- drivers/video/bcm2835.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/bcm2835.c b/drivers/video/bcm2835.c index 58a6163..1404340 100644 --- a/drivers/video/bcm2835.c +++ b/drivers/video/bcm2835.c @@ -52,7 +52,7 @@ void lcd_ctrl_init(void *lcdbase) return; } - w = msg_query->physical_w_h.body.resp.width; + w = ROUND(msg_query->physical_w_h.body.resp.width, 16); h = msg_query->physical_w_h.body.resp.height; debug("bcm2835: Setting up display for %d x %d\n", w, h); -- 1.8.3.2

3 14

[U-Boot] [PATCH v1] patman: add Series-commit-notes tag and section
by Albert ARIBAUD 12 Nov '13

12 Nov '13

Sometimes a commit should have notes enclosed with it rather than withing the cover letter -- possibly even because there is no cover letter. Add 'Series-commit-notes' tag, similar to 'Series-notes'; lines between this tag and the next END line are inserted in the patch right after the '---' separator line. Signed-off-by: Albert ARIBAUD <albert.u.boot(a)aribaud.net> --- tools/patman/commit.py | 2 ++ tools/patman/patchstream.py | 7 +++++-- tools/patman/series.py | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/patman/commit.py b/tools/patman/commit.py index 900cfb3..89cce7f 100644 --- a/tools/patman/commit.py +++ b/tools/patman/commit.py @@ -21,6 +21,7 @@ class Commit: changes: Dict containing a list of changes (single line strings). The dict is indexed by change version (an integer) cc_list: List of people to aliases/emails to cc on this commit + notes: List of lines in the commit (not series) notes """ def __init__(self, hash): self.hash = hash @@ -28,6 +29,7 @@ class Commit: self.tags = [] self.changes = {} self.cc_list = [] + self.notes = [] def AddChange(self, version, info): """Add a new change line to the change list for a version. diff --git a/tools/patman/patchstream.py b/tools/patman/patchstream.py index c204523..4c20144 100644 --- a/tools/patman/patchstream.py +++ b/tools/patman/patchstream.py @@ -84,7 +84,7 @@ class PatchStream: name: Tag name (part after 'Series-') value: Tag value (part after 'Series-xxx: ') """ - if name == 'notes': + if (name == 'notes' or name == 'commit-notes'): self.in_section = name self.skip_blank = False if self.is_log: @@ -165,6 +165,9 @@ class PatchStream: elif self.in_section == 'notes': if self.is_log: self.series.notes += self.section + elif self.in_section == 'commit-notes': + if self.is_log: + self.commit.notes += self.section else: self.warn.append("Unknown section '%s'" % self.in_section) self.in_section = None @@ -276,7 +279,7 @@ class PatchStream: out = [] log = self.series.MakeChangeLog(self.commit) out += self.FormatTags(self.tags) - out += [line] + log + out += [line] + self.commit.notes + [''] + log elif self.found_test: if not re_allowed_after_test.match(line): self.lines_after_test += 1 diff --git a/tools/patman/series.py b/tools/patman/series.py index 88c0d87..5eeb452 100644 --- a/tools/patman/series.py +++ b/tools/patman/series.py @@ -12,7 +12,7 @@ import terminal # Series-xxx tags that we understand valid_series = ['to', 'cc', 'version', 'changes', 'prefix', 'notes', 'name', - 'cover-cc', 'process_log'] + 'cover-cc', 'process_log', 'commit_notes'] class Series(dict): """Holds information about a patch series, including all tags. -- 1.8.3.2

3 2

[U-Boot] MPC8641D stucks before relocation
by Ashish Khetan 12 Nov '13

12 Nov '13

hii I am using MPC8641D based custom board for evaluation purpose. I am using minimal configuration for this board i.e. only FLASH and DDR initialisation. when I compiled U-boot in debug mode its printing addresses, i check for those addresses and found that it is unable to relocate itself to DDR(4*MT47H64M16). The following message was printed... U-Boot 2013.04 (Oct 25 2013 - 15:05:33) Unicore software on multiprocessor system!! To enable mutlticore build define CONFIG_MP CPU: 8641, Version: 2.1, (0x80900021) Core: E600 Core 0 (MSSCR0=8000, PORDEVSR=ab08307), Version: 2.2, (0x80040202) Clock Configuration: CPU:800 MHz, MPX:400 MHz DDR:200 MHz (400 MT/s data rate), LBC:25 MHz L1: D-cache 32 KB enabled I-cache 32 KB enabled L2: Disabled Board: Wind River SBC8641D DRAM: DDR: 512 MiB Top of RAM usable for U-Boot at: 20000000 Reserving 114k for U-Boot at: 1ffe3000 Reserving 136k for malloc() at: 1ffc1000 Reserving 80 Bytes for Board Info at: 1ffc0fb0 Reserving 152 Bytes for Global Data at: 1ffc0f18 Stack Pointer at: 1ffc0f00 New Stack Pointer is: 1ffc0f00 and stuck here... Any pointer or link to get more about this will be helpful. Thanks in Advance

3 6

[U-Boot] [Patch v1 0/6] Move Freescale DDR and IFC drivers to common drivers
by York Sun 11 Nov '13

11 Nov '13

This patch set attempts to move Freescale DDR and IFC drivers to common drivers, to prepare sharing between powerpc-based and ARM-based SoCs. [Patch v1 1/6] Driver/DDR: Moving Freescale DDR driver to a common [Patch v1 2/6] Driver/DDR: combine ccsr_ddr for 83xx, 85xx and 86xx [Patch v1 3/6] Driver/DDR: Add Freescale DDR driver for ARM [Patch v1 4/6] powerpc/mpc8xxx: Extend DDR registers' fields [Patch v1 5/6] Driver/DDR: Update DDR driver to allow non-zero base [Patch v1 6/6] Driver/IFC: Move Freescale IFC driver to a common York

4 22

[U-Boot] [RESEND PATCH v14 00/10] arm64 pat
by fenghua＠phytium.com.cn 11 Nov '13

11 Nov '13

From: David Feng <fenghua(a)phytium.com.cn> The content is same with original v14. 04/05/06 patches is totally provided by scott wood. Them are mistakenly encoded "From: David Feng", so modify its to "From: Scott Wood". Changes for v14: - Merge rela relocation patches from Scott Wood <scottwood(a)freescale.com>. - Remove all CONFIG_NEED_MANUAL_RELOC and other fixups due to manual relocation. With rela relocation patches them are not needed. - Fix the bug of MEMORY_ATTRIBUTES definition due to assembler. That need put brackets around (MT_NORMAL*8). Otherwise the result is wrong.This bug is reported by York Sun <yorksun(a)freescale.com>. - -msoft-float is not supported by aarch64-gcc, make a test though $(call cc-option,-msoft-float). - Adjust the virtual address space to 42 bits. - Filter armv8 boards from LIST_arm in MAKEALL. - remove gpio.h in asm/arch-armv8/ and move mmu.h to asm/armv8/ directory. - remove vexpress64.dts from this patch, it could be accessed from linux kernel. Changes for v13: - fix the bug of board_r.c and arm/lib/board.c due to CONFIG_NEED_MANUAL_RELOC. adjust initr_serial() in board_r.c to the first entry of init_sequence_r[] and relocate serial_initialize() in arm/lib/board.c, routines of serial_device should be relocated firstly by serial_initialize(), so that printf access the correct puts function, otherwise uninitialized serial_current will be selected as the output device. - fix the bug of dcache_enable(). after mmu_setup the sctrl register value should be fetched again because it has been modifed by mmu_seup() function. This bug is reported by York Sun <yorksun(a)freescale.com>. - add macro branch_if_slave to macro.h, it choose processor with all zero affinity value as the master and is used in start.S. Changes for v12: - custom the patches to new format boards.cfg. Changes for v11: - Replace CONFIG_ARMV8 with CONFIG_ARM64. Currently, it's hard to distinguish what is armv8 specific and what is aarch64 specific, so we use CONFIG_ARM64 only, no CONFIG_ARMV8 used. - rename README.armv8 with README.arm64 and make some modification. Changes for v10: - add weak definition to include/linux/linkage.h and make setup_el2/setup_el3/lowlevel_init weak routines, so them can be easily overridden by processor specific code. - modify s-o-f of 0002-board-support-of-vexpress_aemv8a which use wrong mail address of Bhupesh Sharma. Changes for v9: - add Signed-off-by information to patch "board support of vexpress_aemv8a" which SMC91111 support is integrated from Sharma Bhupesh's patch. - adjust pt_regs struct and add exception state preservation in exception.S. Changes for v8: - Integrate SMC91111 patch of sharma bhupesh. - remove v8_outer_cache* which is not need currently. - Change license tag. - Mov crt0.S/relocate.S/interrupts.c to arm/lib and rename them with _64 suffix. - Make el3/el2 initializing process of start.S as two separate routines. It could be easier to be replaced with processor specific codes. - Remove exception stack save and restore routine, it is unnecessary now. - simplify __weak function declaration. Changes for v7: - Check the patches with checkpatch.pl and get rid of almost all warnings. There are a few warnings still, but I think it should be that. - change printf format in cmd_pxe.c, use %zd indtead of %ld to format size_t type variable. - add macro PGTABLE_SIZE to identify tlb table size. Changes for v6: - Make modification to inappropriate licensed file and bugs according to ScottWood's advice. Thanks Scott for his checking to these patches. - Enable u-boot's running at EL1. - Get rid of compiling warnings originated from cmd_pxe.c. Changes for v5: - fix the generic board_f.c, remove zero_global_data from init_sequence_f array and move it to board_init_f() function with CONFIG_X86 switch. The previous fixup is inaccurate. - Replace __ARMEB__ with __AARCH64EB__ in byteorder.h and unaligned.h, gcc for aarch64 use __AARCH64EB__ and __AARCH64EL__ to identify endian. - Some modification to README.armv8 Changes for v4: - merge arm64 to arm architecture. David Feng (10): fdt_support: 64bit initrd start address support cmd_pxe.c: remove compiling warnings add weak entry definition arm64: Add tool to statically apply RELA relocations arm64: Turn u-boot.bin back into an ELF file after relocate-rela arm64: Make checkarmreloc accept arm64 relocations arm64: core support arm64: generic board support arm64: board support of vexpress_aemv8a arm64: MAKEALL, filter armv8 boards from LIST_arm MAKEALL | 13 +- Makefile | 39 +++++- arch/arm/config.mk | 3 +- arch/arm/cpu/armv8/Makefile | 38 +++++ arch/arm/cpu/armv8/cache.S | 130 +++++++++++++++++ arch/arm/cpu/armv8/cache_v8.c | 218 ++++++++++++++++++++++++++++ arch/arm/cpu/armv8/config.mk | 15 ++ arch/arm/cpu/armv8/cpu.c | 67 +++++++++ arch/arm/cpu/armv8/exceptions.S | 112 +++++++++++++++ arch/arm/cpu/armv8/start.S | 234 +++++++++++++++++++++++++++++++ arch/arm/cpu/armv8/timer.c | 80 +++++++++++ arch/arm/cpu/armv8/tlb.S | 30 ++++ arch/arm/cpu/armv8/u-boot.lds | 89 ++++++++++++ arch/arm/include/asm/armv8/mmu.h | 110 +++++++++++++++ arch/arm/include/asm/byteorder.h | 12 ++ arch/arm/include/asm/cache.h | 5 + arch/arm/include/asm/config.h | 6 + arch/arm/include/asm/global_data.h | 6 +- arch/arm/include/asm/io.h | 15 +- arch/arm/include/asm/macro.h | 36 +++++ arch/arm/include/asm/posix_types.h | 10 ++ arch/arm/include/asm/proc-armv/ptrace.h | 21 +++ arch/arm/include/asm/proc-armv/system.h | 59 +++++++- arch/arm/include/asm/system.h | 77 ++++++++++ arch/arm/include/asm/types.h | 4 + arch/arm/include/asm/u-boot.h | 4 + arch/arm/include/asm/unaligned.h | 2 +- arch/arm/lib/Makefile | 14 ++ arch/arm/lib/board.c | 7 +- arch/arm/lib/bootm.c | 16 +++ arch/arm/lib/crt0_64.S | 113 +++++++++++++++ arch/arm/lib/interrupts_64.c | 120 ++++++++++++++++ arch/arm/lib/relocate_64.S | 58 ++++++++ board/armltd/vexpress64/Makefile | 27 ++++ board/armltd/vexpress64/vexpress64.c | 50 +++++++ boards.cfg | 1 + common/board_f.c | 20 ++- common/cmd_pxe.c | 4 +- common/fdt_support.c | 66 ++++----- common/image.c | 1 + doc/README.arm64 | 45 ++++++ examples/standalone/stubs.c | 15 ++ include/configs/vexpress_aemv8a.h | 191 +++++++++++++++++++++++++ include/image.h | 1 + include/linux/linkage.h | 4 + tools/Makefile | 6 + tools/relocate-rela.c | 185 ++++++++++++++++++++++++ 47 files changed, 2321 insertions(+), 58 deletions(-) create mode 100644 arch/arm/cpu/armv8/Makefile create mode 100644 arch/arm/cpu/armv8/cache.S create mode 100644 arch/arm/cpu/armv8/cache_v8.c create mode 100644 arch/arm/cpu/armv8/config.mk create mode 100644 arch/arm/cpu/armv8/cpu.c create mode 100644 arch/arm/cpu/armv8/exceptions.S create mode 100644 arch/arm/cpu/armv8/start.S create mode 100644 arch/arm/cpu/armv8/timer.c create mode 100644 arch/arm/cpu/armv8/tlb.S create mode 100644 arch/arm/cpu/armv8/u-boot.lds create mode 100644 arch/arm/include/asm/armv8/mmu.h create mode 100644 arch/arm/lib/crt0_64.S create mode 100644 arch/arm/lib/interrupts_64.c create mode 100644 arch/arm/lib/relocate_64.S create mode 100644 board/armltd/vexpress64/Makefile create mode 100644 board/armltd/vexpress64/vexpress64.c create mode 100644 doc/README.arm64 create mode 100644 include/configs/vexpress_aemv8a.h create mode 100644 tools/relocate-rela.c -- 1.7.9.5

4 13

[U-Boot] Question about patman
by Masahiro Yamada 11 Nov '13

11 Nov '13

Hello Simon. I'm trying patman, but it looks like it doesn't work on my Ubuntu box. How can I resove the following issue? The subject of HEAD is ARM: align MVBAR on 32 byte boundary and the result of my dry run is: $ python --version Python 2.7.4 $ tools/patman/patman -n -c1 Cleaned 1 patches Traceback (most recent call last): File "tools/patman/patman", line 153, in <module> not options.ignore_bad_tags) File "/home/yamada/workspace/arm-linux-pf/u-boot/tools/patman/series.py", line 225, in MakeCcFile raise_on_error=raise_on_error) File "/home/yamada/workspace/arm-linux-pf/u-boot/tools/patman/gitutil.py", line 308, in BuildEmailList raw += LookupEmail(item, alias, raise_on_error=raise_on_error) File "/home/yamada/workspace/arm-linux-pf/u-boot/tools/patman/gitutil.py", line 472, in LookupEmail raise ValueError, msg ValueError: Alias 'arm' not found Best Regards Masahiro Yamada

4 5

[U-Boot] [PATCH] powerpc/t1040qds: Add DDR Raw Timing support
by Priyanka Jain 11 Nov '13

11 Nov '13

T1040QDS-D3 has dual-rank DDR: Micron, MT18KSF51272AZ-1G6 (4GB, x72, CL=10). Add Raw Timing structure for this DDR. Typically SPD method is used for getting DDR parameter and calculating values for various DDR controller registers. But somentimes it may happen that SPD present on DDR may get accidently erased or is not working properly during initial bring-up. In that circumnstance, DDR raw timing structure can be use as fallback option for getting DDR parameters. Signed-off-by: Poonam Aggrwal <poonam.aggrwal(a)freescale.com> Signed-off-by: Priyanka Jain <Priyanka.Jain(a)freescale.com> --- Based on u-boot-mpc85xx/next branch. board/freescale/t1040qds/ddr.c | 15 +++++++++++++++ board/freescale/t1040qds/ddr.h | 29 +++++++++++++++++++++++++++++ include/configs/T1040QDS.h | 1 + 3 files changed, 45 insertions(+), 0 deletions(-) diff --git a/board/freescale/t1040qds/ddr.c b/board/freescale/t1040qds/ddr.c index 4fd17da..16ab829 100644 --- a/board/freescale/t1040qds/ddr.c +++ b/board/freescale/t1040qds/ddr.c @@ -15,6 +15,21 @@ DECLARE_GLOBAL_DATA_PTR; +int fsl_ddr_get_dimm_params(dimm_params_t *pdimm, + unsigned int controller_number, + unsigned int dimm_number) +{ + const char dimm_model[] = "RAW timing DDR"; + + if ((controller_number == 0) && (dimm_number == 0)) { + memcpy(pdimm, &ddr_raw_timing, sizeof(dimm_params_t)); + memset(pdimm->mpart, 0, sizeof(pdimm->mpart)); + memcpy(pdimm->mpart, dimm_model, sizeof(dimm_model) - 1); + } + + return 0; +} + void fsl_ddr_board_options(memctl_options_t *popts, dimm_params_t *pdimm, unsigned int ctrl_num) diff --git a/board/freescale/t1040qds/ddr.h b/board/freescale/t1040qds/ddr.h index 8ee206e..4a4f76a 100644 --- a/board/freescale/t1040qds/ddr.h +++ b/board/freescale/t1040qds/ddr.h @@ -6,6 +6,35 @@ #ifndef __DDR_H__ #define __DDR_H__ +dimm_params_t ddr_raw_timing = { + .n_ranks = 2, + .rank_density = 2147483648u, + .capacity = 4294967296u, + .primary_sdram_width = 64, + .ec_sdram_width = 8, + .registered_dimm = 0, + .mirrored_dimm = 0, + .n_row_addr = 15, + .n_col_addr = 10, + .n_banks_per_sdram_device = 8, + .edc_config = 2, /* ECC */ + .burst_lengths_bitmask = 0x0c, + .tckmin_x_ps = 1071, + .caslat_x = 0xfe << 4, /* 5,6,7,8,9,10,11 */ + .taa_ps = 13125, + .twr_ps = 15000, + .trcd_ps = 13125, + .trrd_ps = 6000, + .trp_ps = 13125, + .tras_ps = 34000, + .trc_ps = 48125, + .trfc_ps = 260000, + .twtr_ps = 7500, + .trtp_ps = 7500, + .refresh_rate_ps = 7800000, + .tfaw_ps = 35000, +}; + struct board_specific_parameters { u32 n_ranks; u32 datarate_mhz_high; diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index 2738242..a8b32fe 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -168,6 +168,7 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_CHIP_SELECTS_PER_CTRL (4 * CONFIG_DIMM_SLOTS_PER_CTLR) #define CONFIG_DDR_SPD +#define CONFIG_SYS_DDR_RAW_TIMING #define CONFIG_FSL_DDR3 #define CONFIG_FSL_DDR_INTERACTIVE -- 1.7.4.1

4 4

[U-Boot] [PATCH 1/4] serial: sh: Add support R8A7791
by Nobuhiro Iwamatsu 11 Nov '13

11 Nov '13

This adds the preset value to register for R8A7791. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj(a)renesas.com> CC: Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> --- drivers/serial/serial_sh.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/serial/serial_sh.h b/drivers/serial/serial_sh.h index a6558af..556b868 100644 --- a/drivers/serial/serial_sh.h +++ b/drivers/serial/serial_sh.h @@ -224,7 +224,7 @@ struct uart_port { # define SCSPTR3 0xffc60020 /* 16 bit SCIF */ # define SCIF_ORER 0x0001 /* Overrun error bit */ # define SCSCR_INIT(port) 0x38 /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */ -#elif defined(CONFIG_R8A7790) +#elif defined(CONFIG_R8A7790) || defined(CONFIG_R8A7791) # define SCIF_ORER 0x0001 # define SCSCR_INIT(port) 0x32 /* TIE=0,RIE=0,TE=1,RE=1,REIE=0, */ #else @@ -301,7 +301,7 @@ struct uart_port { /* SH7763 SCIF2 support */ # define SCIF2_RFDC_MASK 0x001f # define SCIF2_TXROOM_MAX 16 -#elif defined(CONFIG_R8A7790) +#elif defined(CONFIG_R8A7790) || defined(CONFIG_R8A7791) # define SCIF_ERRORS (SCIF_PER | SCIF_FER | SCIF_ER | SCIF_BRK) # define SCIF_RFDC_MASK 0x003f #else @@ -585,7 +585,7 @@ SCIF_FNS(SCSPTR, 0, 0, 0, 0) #else SCIF_FNS(SCSPTR, 0, 0, 0x20, 16) #endif -#if defined(CONFIG_R8A7790) +#if defined(CONFIG_R8A7790) || defined(CONFIG_R8A7791) SCIF_FNS(DL, 0, 0, 0x30, 16) SCIF_FNS(CKS, 0, 0, 0x34, 16) #endif @@ -730,7 +730,7 @@ static inline int scbrr_calc(struct uart_port port, int bps, int clk) #define SCBRR_VALUE(bps, clk) scbrr_calc(sh_sci, bps, clk) #elif defined(__H8300H__) || defined(__H8300S__) #define SCBRR_VALUE(bps, clk) (((clk*1000/32)/bps)-1) -#elif defined(CONFIG_R8A7790) +#elif defined(CONFIG_R8A7790) || defined(CONFIG_R8A7791) #define SCBRR DL #define SCBRR_VALUE(bps, clk) (clk / bps / 16) #else /* Generic SH */ -- 1.8.4.rc3

2 9

[U-Boot] [PATCH] malta: define CONFIG_MEMSIZE_IN_BYTES
by Gabor Juhos 09 Nov '13

09 Nov '13

The memsize environment variable must contain the memory size in bytes on the Malta board. Otherwise Linux will use wrong memory size which causes a kernel panic. Define CONFIG_MEMSIZE_IN_BYTES in malta.h to avoid that. Signed-off-by: Gabor Juhos <juhosg(a)openwrt.org> Cc: Daniel Schwierzeck <daniel.schwierzeck(a)googlemail.com> Cc: Paul Burton <paul.burton(a)imgtec.com> --- Note: The patch depends on Paul's 'MIPS Malta board support' series. If we want to fix the problem before his patches will be merged, I will send a different patch. -Gabor For the record, the kernel panic looks like this: qemu-malta # setenv ipaddr 10.0.2.1 qemu-malta # setenv serverip 10.0.2.2 qemu-malta # setenv ethadd 00:11:22:33:44:55 qemu-malta # tftp 0xa1000000 openwrt-malta-be-uImage-gzip Using pcnet#0 device TFTP from server 10.0.2.2; our IP address is 10.0.2.1 Filename 'openwrt-malta-be-uImage-gzip'. Load address: 0xa1000000 Loading: ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ####################################################### 45.2 MiB/s done Bytes transferred = 2940191 (2cdd1f hex) qemu-malta # bootm ## Current stack ends at 0x8ff83a38 ## Booting kernel from Legacy Image at a1000000 ... Image Name: MIPS OpenWrt Linux-3.8.13 Image Type: MIPS Linux Kernel Image (gzip compressed) Data Size: 2940127 Bytes = 2.8 MiB Load Address: 80100000 Entry Point: 80104a90 Verifying Checksum ... OK Uncompressing Kernel Image ... OK ## Giving linux memsize in MB, 256 ## Transferring control to Linux (at address 80104a90) ... Starting kernel ... [ 0.000000] Linux version 3.8.13 (juhosg@mag2) (gcc version 4.6.4 20121210 (prerelease) (Linaro GCC 4.6-2012.12) ) #1 SMP Wed May 22 14:28:37 CEST 2013 [ 0.000000] Config serial console: console=ttyS0,38400n8r [ 0.000000] bootconsole [early0] enabled [ 0.000000] CPU revision is: 00019300 (MIPS 24Kc) [ 0.000000] FPU revision is: 00739300 [ 0.000000] Determined physical RAM map: [ 0.000000] memory: 00001000 @ 00000000 (reserved) [ 0.000000] memory: 000ef000 @ 00001000 (ROM data) [ 0.000000] memory: 00676000 @ 000f0000 (reserved) [ 0.000000] memory: ff899100 @ 00766000 (usable) [ 0.000000] Wasting 60608 bytes for tracking 1894 unused pages [ 0.000000] Initrd not found or empty - disabling initrd [ 0.000000] Zone ranges: [ 0.000000] DMA [mem 0x00000000-0x00ffffff] [ 0.000000] Normal [mem 0x01000000-0x1fffffff] [ 0.000000] Movable zone start for each node [ 0.000000] Early memory node ranges [ 0.000000] node 0: [mem 0x00000000-0x1fffffff] [ 0.000000] Primary instruction cache 2kB, VIPT, 2-way, linesize 16 bytes. [ 0.000000] Primary data cache 2kB, 2-way, VIPT, no aliases, linesize 16 bytes [ 0.000000] PERCPU: Embedded 7 pages/cpu @81404000 s6464 r8192 d14016 u32768 [ 0.000000] Built 1 zonelists in Zone order, mobility grouping on. Total pages: 130048 [ 0.000000] Kernel command line: console=ttyS0,38400n8r [ 0.000000] PID hash table entries: 2048 (order: 1, 8192 bytes) [ 0.000000] Dentry cache hash table entries: 65536 (order: 6, 262144 bytes) [ 0.000000] Inode-cache hash table entries: 32768 (order: 5, 131072 bytes) [ 0.000000] __ex_table already sorted, skipping sort [ 0.000000] Writing ErrCtl register=00000000 [ 0.000000] Readback ErrCtl register=00000000 [ 0.000000] Memory: 512156k/516712k available (2519k kernel code, 4556k reserved, 622k data, 3320k init, 0k highmem) [ 0.000000] CPU 0 Unable to handle kernel paging request at virtual address 00000004, epc == 8019c018, ra == 8019bec0 [ 0.000000] Oops[#1]: [ 0.000000] Cpu 0 [ 0.000000] $ 0 : 00000000 00000030 00000000 00000000 [ 0.000000] $ 4 : 80407174 00100100 00000000 803ffe54 [ 0.000000] $ 8 : 00000001 81404a54 803ffe54 00000000 [ 0.000000] $12 : 80401a2c 00000000 00000019 00000000 [ 0.000000] $16 : 80407100 9f801000 80407164 8043e340 [ 0.000000] $20 : ffffffff ffffffff 00008000 8043e350 [ 0.000000] $24 : 00000003 80401be4 [ 0.000000] $28 : 803f0000 803f1e10 80760000 8019bec0 [ 0.000000] Hi : 00000050 [ 0.000000] Lo : 005214c3 [ 0.000000] epc : 8019c018 cache_alloc_refill+0x1e4/0x698 [ 0.000000] Not tainted [ 0.000000] ra : 8019bec0 cache_alloc_refill+0x8c/0x698 [ 0.000000] Status: 10000002 KERNEL EXL [ 0.000000] Cause : 4080840c [ 0.000000] BadVA : 00000004 [ 0.000000] PrId : 00019300 (MIPS 24Kc) [ 0.000000] Modules linked in: [ 0.000000] Process swapper (pid: 0, threadinfo=803f0000, task=80402458, tls=00000000) [ 0.000000] Stack : 8075b03e 00000000 00000001 00000000 00000000 8043e364 00000080 00000006 8043e3ec 00000000 80407100 00008000 80400000 8043e340 80440000 80440000 a12cdd1f 8019c6b8 000011cc 80760000 80760000 80760000 80407100 8043e3ec 803ad668 00000020 00002000 8041f098 00000000 00000000 803a6170 803f1ea4 803f1ea4 8043e3ec 80760000 80440000 8040704c 80420e0c 0007e268 000009d7 ... [ 0.000000] Call Trace: [ 0.000000] [<8019c018>] cache_alloc_refill+0x1e4/0x698 [ 0.000000] [<8019c6b8>] kmem_cache_alloc+0x98/0x108 [ 0.000000] [<8041f098>] create_kmalloc_cache+0x34/0xa8 [ 0.000000] [<80420e0c>] kmem_cache_init+0x124/0x2c4 [ 0.000000] [<8041274c>] start_kernel+0x1c4/0x3b8 [ 0.000000] [ 0.000000] Code: 8e230000 3c050010 34a50100 <ac620004> ac430000 8e230014 3c020020 24420200 ae220004 [ 0.000000] ---[ end trace 139ce121c98e96c9 ]--- [ 0.000000] Kernel panic - not syncing: Attempted to kill the idle task! qemu: terminating on signal 15 from pid 4169 --- include/configs/malta.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/configs/malta.h b/include/configs/malta.h index 19acf3a..a4370ae 100644 --- a/include/configs/malta.h +++ b/include/configs/malta.h @@ -15,6 +15,8 @@ */ #define CONFIG_MALTA +#define CONFIG_MEMSIZE_IN_BYTES + #define CONFIG_PCI #define CONFIG_PCI_GT64120 #define CONFIG_PCI_MSC01 -- 1.7.10

3 2