December 2013 - U-Boot

Re: [U-Boot] Questions：Toolchain for patch [U-Boot,3/4] arm64: Non-manual relocation
by Scott Wood 05 Dec '13

05 Dec '13

On Wed, 2013-12-04 at 22:01 -0800, Shouming Wang wrote: > Hi Scott > I try to verify your patch "[U-Boot,3/4] arm64: Non-manual relocation": > http://patchwork.ozlabs.org/patch/280442/, but meet the following compile error. > aarch64-linux-gnu-objcopy -O srec u-boot u-boot.srec > aarch64-linux-gnu-objcopy:u-boot: Bad value > make[1]: *** [u-boot.srec] Error 1 > > Have you ever met this issue? And which toochain are you > using? Toolchain I am using is > gcc-linaro-aarch64-linux-gnu-4.8-2013.11_linux.tar.xz. I think I was using gcc-linaro-aarch64-linux-gnu-4.8-2013.05. Are you sure this patch is the one that made the difference? Do you see the problem in the context of David Feng's latest patchset that includes the above patch? Do you see anything weird if you use nm, readelf, etc. on the u-boot binary? It would be nice if objcopy were more verbose about its complaint... -Scott

1 0

[U-Boot] eMMC boot partition support in uboot
by Richard Retanubun 05 Dec '13

05 Dec '13

Hi guys, Recap: I am trying to boot MLO + uboot from eMMC boot partition on DRA7xx_EVM eval platform. SW-Baseline: uboot p-ti-uboot-2013.04 & p-ti-linux-3.8.y from omapzoom. What happens so far: 1. I am able to dd the MLO into /dev/mmcblk1boot0 (need to echo 0 to force_ro). 2. I am able to setup the eMMC to enable the ROM BootLoader (RBL) to boot the "Alternate boot mode" using mmc-utils by setting: BOOT_BUS_WIDTH Register (EXT_CSD [177]) = 0x15 (needed to set DDR mode at boot) PARTITION_CONFIG Register (EXT_CSD [179]) = 0x48 (needed to enable booting from boot partition) Up to this point I am able to get this response when booting the MLO from the eMMC boot partition U-Boot SPL 2013.04-00366-g5f72750-dirty (Dec 03 2013 - 21:40:19) DRA752 ES1.0 OMAP SD/MMC: 1 spl: wrong MMC boot mode spl_mmc_load_image: spl_boot_mode = 0 (MMCSD_MODE_UNDEFINED) spl_boot_device = 6 (BOOT_DEVICE_MMC2) ### ERROR ### Please RESET the board ### 3. I realize that the MLO contents (using uboot/tools/omapimage?) needed to say MMCSD_MODE_RAW for my platform. I am bypassing this problem by by hard coding the response arch/arm/cpu/armv7/omap-common/boot-common.c::spl_boot_mode() to always says MMCSD_MODE_RAW. This seems to work and I am past the hang() code. 4. Now, MLO is ready to (raw) load uboot binary from the eMMC boot partition (i.e. /dev/mmcblk1boot0). Unfortunately, at this point I don't know how to make the platform recognize the eMMC boot partitions. I think they are not modelled yet in uboot. Only the User-Data-Area (UDA) is recognized in uboot (called mmc 1) My understanding is that for mmc boot partition recognition, we need to extend drivers/mmc/omap_hsmmc.c::omap_mmc_init() to be able to handle it? or is there a better place? Question 1: Is my understanding of the current state all correct? Question 2: How should I proceed to add support for /dev/mmcblk1boot0 into uboot? I am thinking the solution should self parse the ext_csd to find out which boot partition is active and then load the uboot raw from a known offset there. I saw the linux patch adding eMMC boot partition at: http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/Docum… But I don't see how to adapt it into uboot... Thanks for everyone's time.

2 2

[U-Boot] [PATCH v3] mtd: move & update nand_ecclayout structure (plus board changes)
by Scott Wood 05 Dec '13

05 Dec '13

From: Prabhakar Kushwaha <prabhakar(a)freescale.com> nand_ecclayout is present in mtd.h at Linux. Move this structure to mtd.h to comply with Linux. Also, increase the ecc placement locations to 640 to suport device having writesize/oobsize of 8KB/640B. This means that the maximum oobsize has gone up to 640 bytes and consequently the maximum ecc placement locations have also gone up to 640. Changes from Prabhabkar's version (squashed into one patch to preserve bisectability): - Added _LARGE to MTD_MAX_*_ENTRIES This makes the names match current Linux source, and resolves a conflict between http://patchwork.ozlabs.org/patch/280488/ and http://patchwork.ozlabs.org/patch/284513/ The former was posted first and is closer to matching Linux, but unlike Linux it does not add _LARGE to the names. The second adds _LARGE to one of the names, and depends on it in a subsequent patch (http://patchwork.ozlabs.org/patch/284512/). - Made max oobfree/eccpos configurable, and used this on tricorder, alpr, ASH405, T4160QDS, and T4240QDS (these boards failed to build for me without doing so, due to a size increase). On tricorder SPL, this saves 2576 bytes (and makes the SPL build again) versus the new default of 640 eccpos and 32 oobfree, and saves 336 bytes versus the old default of 128 eccpos and 8 oobfree. Signed-off-by: Prabhakar Kushwaha <prabhakar(a)freescale.com> CC: Vipin Kumar <vipin.kumar(a)st.com> [scottwood(a)freescale.com: changes as described above] Signed-off-by: Scott Wood <scottwood(a)freescale.com> Cc: Thomas Weber <weber(a)corscience.de> Cc: Matthias Fuchs <matthias.fuchs(a)esd-electronics.com> Cc: Stefan Roese <sr(a)denx.de> Cc: York Sun <yorksun(a)freescale.com> Cc: Tom Rini <trini(a)ti.com> --- v3: fix some PPC boards as well v2: add a fix for SPL size on tricorder, and squash patches together for bisectability doc/README.nand | 10 ++++++++++ drivers/mtd/onenand/onenand_base.c | 15 ++++++++++----- include/configs/ASH405.h | 2 ++ include/configs/MPC8572DS.h | 2 ++ include/configs/T4240QDS.h | 2 ++ include/configs/alpr.h | 2 ++ include/configs/tricorder.h | 2 ++ include/linux/mtd/mtd.h | 23 +++++++++++++++++++++++ include/mtd/mtd-abi.h | 12 ------------ 9 files changed, 53 insertions(+), 17 deletions(-) diff --git a/doc/README.nand b/doc/README.nand index 913e9b5..3a507b6 100644 --- a/doc/README.nand +++ b/doc/README.nand @@ -104,6 +104,16 @@ Configuration Options: CONFIG_SYS_MAX_NAND_DEVICE The maximum number of NAND devices you want to support. + CONFIG_SYS_NAND_MAX_ECCPOS + If specified, overrides the maximum number of ECC bytes + supported. Useful for reducing image size, especially with SPL. + This must be at least 48 if nand_base.c is used. + + CONFIG_SYS_NAND_MAX_OOBFREE + If specified, overrides the maximum number of free OOB regions + supported. Useful for reducing image size, especially with SPL. + This must be at least 2 if nand_base.c is used. + CONFIG_SYS_NAND_MAX_CHIPS The maximum number of NAND chips per device to be supported. diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c index 067f8ef..979e4af 100644 --- a/drivers/mtd/onenand/onenand_base.c +++ b/drivers/mtd/onenand/onenand_base.c @@ -761,7 +761,8 @@ static int onenand_transfer_auto_oob(struct mtd_info *mtd, uint8_t *buf, uint8_t *oob_buf = this->oob_buf; free = this->ecclayout->oobfree; - for (i = 0; i < MTD_MAX_OOBFREE_ENTRIES && free->length; i++, free++) { + for (i = 0; i < MTD_MAX_OOBFREE_ENTRIES_LARGE && free->length; + i++, free++) { if (readcol >= lastgap) readcol += free->offset - lastgap; if (readend >= lastgap) @@ -770,7 +771,8 @@ static int onenand_transfer_auto_oob(struct mtd_info *mtd, uint8_t *buf, } this->read_bufferram(mtd, 0, ONENAND_SPARERAM, oob_buf, 0, mtd->oobsize); free = this->ecclayout->oobfree; - for (i = 0; i < MTD_MAX_OOBFREE_ENTRIES && free->length; i++, free++) { + for (i = 0; i < MTD_MAX_OOBFREE_ENTRIES_LARGE && free->length; + i++, free++) { int free_end = free->offset + free->length; if (free->offset < readend && free_end > readcol) { int st = max_t(int,free->offset,readcol); @@ -1356,7 +1358,8 @@ static int onenand_fill_auto_oob(struct mtd_info *mtd, u_char *oob_buf, unsigned int i; free = this->ecclayout->oobfree; - for (i = 0; i < MTD_MAX_OOBFREE_ENTRIES && free->length; i++, free++) { + for (i = 0; i < MTD_MAX_OOBFREE_ENTRIES_LARGE && free->length; + i++, free++) { if (writecol >= lastgap) writecol += free->offset - lastgap; if (writeend >= lastgap) @@ -1364,7 +1367,8 @@ static int onenand_fill_auto_oob(struct mtd_info *mtd, u_char *oob_buf, lastgap = free->offset + free->length; } free = this->ecclayout->oobfree; - for (i = 0; i < MTD_MAX_OOBFREE_ENTRIES && free->length; i++, free++) { + for (i = 0; i < MTD_MAX_OOBFREE_ENTRIES_LARGE && free->length; + i++, free++) { int free_end = free->offset + free->length; if (free->offset < writeend && free_end > writecol) { int st = max_t(int,free->offset,writecol); @@ -2750,7 +2754,8 @@ int onenand_scan(struct mtd_info *mtd, int maxchips) * the out of band area */ this->ecclayout->oobavail = 0; - for (i = 0; i < MTD_MAX_OOBFREE_ENTRIES && + + for (i = 0; i < MTD_MAX_OOBFREE_ENTRIES_LARGE && this->ecclayout->oobfree[i].length; i++) this->ecclayout->oobavail += this->ecclayout->oobfree[i].length; diff --git a/include/configs/ASH405.h b/include/configs/ASH405.h index 9460be3..2f53407 100644 --- a/include/configs/ASH405.h +++ b/include/configs/ASH405.h @@ -143,6 +143,8 @@ #define CONFIG_SYS_NAND_SKIP_BAD_DOT_I 1 /* ".i" read skips bad blocks */ #define CONFIG_SYS_NAND_QUIET 1 +#define CONFIG_SYS_NAND_MAX_OOBFREE 2 +#define CONFIG_SYS_NAND_MAX_ECCPOS 56 /*----------------------------------------------------------------------- * PCI stuff diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h index c751144..9ad9402 100644 --- a/include/configs/MPC8572DS.h +++ b/include/configs/MPC8572DS.h @@ -322,6 +322,8 @@ #define CONFIG_CMD_NAND 1 #define CONFIG_NAND_FSL_ELBC 1 #define CONFIG_SYS_NAND_BLOCK_SIZE (128 * 1024) +#define CONFIG_SYS_NAND_MAX_OOBFREE 5 +#define CONFIG_SYS_NAND_MAX_ECCPOS 56 /* NAND boot: 4K NAND loader config */ #define CONFIG_SYS_NAND_SPL_SIZE 0x1000 diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h index 3777ccb..c96df54 100644 --- a/include/configs/T4240QDS.h +++ b/include/configs/T4240QDS.h @@ -229,6 +229,8 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_CMD_NAND #define CONFIG_SYS_NAND_BLOCK_SIZE (128 * 1024) +#define CONFIG_SYS_NAND_MAX_OOBFREE 2 +#define CONFIG_SYS_NAND_MAX_ECCPOS 256 #if defined(CONFIG_NAND) #define CONFIG_SYS_CSPR0_EXT CONFIG_SYS_NAND_CSPR_EXT diff --git a/include/configs/alpr.h b/include/configs/alpr.h index 2bf1986..61fdeba 100644 --- a/include/configs/alpr.h +++ b/include/configs/alpr.h @@ -324,6 +324,8 @@ #define CONFIG_SYS_NAND_BASE_LIST { CONFIG_SYS_NAND_BASE + 0, CONFIG_SYS_NAND_BASE + 2, \ CONFIG_SYS_NAND_BASE + 4, CONFIG_SYS_NAND_BASE + 6 } #define CONFIG_SYS_NAND_QUIET_TEST 1 /* don't warn upon unknown NAND flash */ +#define CONFIG_SYS_NAND_MAX_OOBFREE 2 +#define CONFIG_SYS_NAND_MAX_ECCPOS 56 /*----------------------------------------------------------------------- * External Bus Controller (EBC) Setup diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index d57394e..590eab7 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -140,6 +140,8 @@ /* devices */ #define CONFIG_NAND_OMAP_BCH8 #define CONFIG_BCH +#define CONFIG_SYS_NAND_MAX_OOBFREE 2 +#define CONFIG_SYS_NAND_MAX_ECCPOS 56 /* commands to include */ #include <config_cmd_default.h> diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h index 6f44abd..a65b681 100644 --- a/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h @@ -96,6 +96,29 @@ struct mtd_oob_ops { uint8_t *oobbuf; }; +#ifdef CONFIG_SYS_NAND_MAX_OOBFREE +#define MTD_MAX_OOBFREE_ENTRIES_LARGE CONFIG_SYS_NAND_MAX_OOBFREE +#else +#define MTD_MAX_OOBFREE_ENTRIES_LARGE 32 +#endif + +#ifdef CONFIG_SYS_NAND_MAX_ECCPOS +#define MTD_MAX_ECCPOS_ENTRIES_LARGE CONFIG_SYS_NAND_MAX_ECCPOS +#else +#define MTD_MAX_ECCPOS_ENTRIES_LARGE 640 +#endif + +/* + * ECC layout control structure. Exported to userspace for + * diagnosis and to allow creation of raw images + */ +struct nand_ecclayout { + uint32_t eccbytes; + uint32_t eccpos[MTD_MAX_ECCPOS_ENTRIES_LARGE]; + uint32_t oobavail; + struct nand_oobfree oobfree[MTD_MAX_OOBFREE_ENTRIES_LARGE]; +}; + struct mtd_info { u_char type; u_int32_t flags; diff --git a/include/mtd/mtd-abi.h b/include/mtd/mtd-abi.h index d51c1ab..ac3c298 100644 --- a/include/mtd/mtd-abi.h +++ b/include/mtd/mtd-abi.h @@ -155,18 +155,6 @@ struct nand_oobfree { uint32_t length; }; -#define MTD_MAX_OOBFREE_ENTRIES 8 -/* - * ECC layout control structure. Exported to userspace for - * diagnosis and to allow creation of raw images - */ -struct nand_ecclayout { - uint32_t eccbytes; - uint32_t eccpos[128]; - uint32_t oobavail; - struct nand_oobfree oobfree[MTD_MAX_OOBFREE_ENTRIES]; -}; - /** * struct mtd_ecc_stats - error correction stats * -- 1.8.1.2

3 3

[U-Boot] [RFC] Adding spl_usb code to common area
by Dan Murphy 05 Dec '13

05 Dec '13

This patch series adds the support to initialize the USB host controller scan for a USB mass storage device and load a file. Currently only FAT image load is supported but I left the RAW image loading code in the file to further develop this. This work was derived from the spl_mmc.c code

1 2

[U-Boot] [PATCH] ARM: OMAP4: Fix bug in omap4470_volts struct
by Lubomir Popov 05 Dec '13

05 Dec '13

The struct incorrectly referenced SMPS1 for all three power domains. Fixed this by using SMPS2 and SMPS5 as appropriate. Add some comments and choose voltage values that correspond to voltage selection codes. Signed-off-by: Lubomir Popov <l-popov(a)ti.com> --- arch/arm/cpu/armv7/omap4/hw_data.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/arch/arm/cpu/armv7/omap4/hw_data.c b/arch/arm/cpu/armv7/omap4/hw_data.c index 6a225c8..1b2f439 100644 --- a/arch/arm/cpu/armv7/omap4/hw_data.c +++ b/arch/arm/cpu/armv7/omap4/hw_data.c @@ -288,17 +288,21 @@ struct vcores_data omap4460_volts = { .mm.pmic = &twl6030, }; +/* + * Take closest integer part of the mV value corresponding to a TWL6032 SMPS + * voltage selection code. Aligned with OMAP4470 ES1.0 OCA V.0.7. + */ struct vcores_data omap4470_volts = { - .mpu.value = 1200, + .mpu.value = 1202, .mpu.addr = SMPS_REG_ADDR_SMPS1, .mpu.pmic = &twl6030, .core.value = 1126, - .core.addr = SMPS_REG_ADDR_SMPS1, + .core.addr = SMPS_REG_ADDR_SMPS2, .core.pmic = &twl6030, - .mm.value = 1137, - .mm.addr = SMPS_REG_ADDR_SMPS1, + .mm.value = 1139, + .mm.addr = SMPS_REG_ADDR_SMPS5, .mm.pmic = &twl6030, }; -- 1.7.9.5

2 2

[U-Boot] [PATCH 0/5] ARM: Exynos5250: consolidate configuration files
by Andre Przywara 05 Dec '13

05 Dec '13

Hi, while working on HYP mode support for Exynos 5250 based boards, I fixed some shortcomings in their configuration files. The purpose of this series is to get rid of the elaborate arndale.h and replace it mostly by an include of exynos5250-dt.h, which currently has an about 90% overlap. I couldn't find any prior art, please bear with me if I have missed something on the list. * Patch 1 fixes a bug, where PMIC support would not have been included in the Arndale build. * Patch 2 removes double definitions. Those two should be considered regardless of the others. * Patch 3 prepares the consolidation of the config files by moving board specific defines out of the generic file. * Patch 4 makes keyboard and LCD support board dependent, please have a closer look at this. I guess SMDK5250 does not have the EC, but it breaks compilation if that is excluded. * Patch 5 then finally removes the now redundant defines in arndale.h and replaces them with an include of exynos5250-dt.h. This series is mostly refactoring, though the config options change a bit for some boards. I could only compile test it, so please test it if you have the hardware. Thanks! Andre Signed-off-by: Andre Przywara <andre.przywara(a)linaro.org> Andre Przywara (5): ARM: Exynos5250: rename obsoleted CONFIG_PMIC defines ARM: Exynos5250: remove redundant defines in exynos5250-dt.h ARM: Exynos5250: move feature defines out of generic config file ARM: snow: move defines for Chromebook embedded controller ARM: Arndale: include generic exynos5250-dt.h in arndale.h drivers/power/power_fsl.c | 2 +- include/configs/arndale.h | 242 +--------------------------------------- include/configs/exynos5250-dt.h | 63 ++++------- include/configs/smdk5250.h | 11 +- include/configs/snow.h | 11 +- 5 files changed, 47 insertions(+), 282 deletions(-) -- 1.7.12.1

4 10

Re: [U-Boot] Sources for MLO on BeagleBone Black?
by Satz Klauer 05 Dec '13

05 Dec '13

Hi, I'm looking for the sources of the MLO bootloader that is used on BeagleBone Black by default. A posting within TIs webboard pointed me to this location but ... where are the sources? While checking the GIT repositiory I could not find anything that looked like "MLO" or "BeagleBone Black". Thanks!

4 6

[U-Boot] [PATCH] Makefile: use two double-quotations as a pair
by Masahiro Yamada 05 Dec '13

05 Dec '13

Some editors such as Emacs can highlight source files. But their parser algorithm is not perfect. If you use one double-quotation alone, some editor cannot handle it nicely and mark non-comment lines as comments by mistake. It is preferable to use two double-quotations as a pair. Signed-off-by: Masahiro Yamada <yamada.m(a)jp.panasonic.com> --- Makefile | 4 ++-- arch/blackfin/config.mk | 4 ++-- dts/Makefile | 2 +- spl/Makefile | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 8b86913..4ad54ad 100644 --- a/Makefile +++ b/Makefile @@ -187,7 +187,7 @@ ifndef LDSCRIPT #LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot.lds.debug ifdef CONFIG_SYS_LDSCRIPT # need to strip off double quotes - LDSCRIPT := $(subst ",,$(CONFIG_SYS_LDSCRIPT)) + LDSCRIPT := $(CONFIG_SYS_LDSCRIPT:"%"=%) endif endif @@ -345,7 +345,7 @@ 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),) -ALL-$(CONFIG_SPL) += $(obj)$(subst ",,$(CONFIG_SPL_TARGET)) +ALL-$(CONFIG_SPL) += $(obj)$(CONFIG_SPL_TARGET:"%"=%) endif # enable combined SPL/u-boot/dtb rules for tegra diff --git a/arch/blackfin/config.mk b/arch/blackfin/config.mk index 35f8716..73fa798 100644 --- a/arch/blackfin/config.mk +++ b/arch/blackfin/config.mk @@ -14,9 +14,9 @@ CONFIG_BFIN_CPU := \ $(shell awk '$$2 == "CONFIG_BFIN_CPU" { print $$3 }' \ $(src)include/configs/$(BOARD).h) else -CONFIG_BFIN_CPU := $(strip $(subst ",,$(CONFIG_BFIN_CPU))) +CONFIG_BFIN_CPU := $(strip $(CONFIG_BFIN_CPU:"%"=%)) endif -CONFIG_BFIN_BOOT_MODE := $(strip $(subst ",,$(CONFIG_BFIN_BOOT_MODE))) +CONFIG_BFIN_BOOT_MODE := $(strip $(CONFIG_BFIN_BOOT_MODE:"%"=%)) PLATFORM_RELFLAGS += -ffixed-P3 -fomit-frame-pointer -mno-fdpic PLATFORM_CPPFLAGS += -DCONFIG_BLACKFIN diff --git a/dts/Makefile b/dts/Makefile index 140c8bc..6c7198f 100644 --- a/dts/Makefile +++ b/dts/Makefile @@ -10,7 +10,7 @@ ifeq ($(DEVICE_TREE),) $(if $(CONFIG_DEFAULT_DEVICE_TREE),,\ $(error Please define CONFIG_DEFAULT_DEVICE_TREE in your board header file)) -DEVICE_TREE = $(subst ",,$(CONFIG_DEFAULT_DEVICE_TREE)) +DEVICE_TREE = $(CONFIG_DEFAULT_DEVICE_TREE:"%"=%) endif DTS_INCDIRS = $(SRCTREE)/board/$(VENDOR)/$(BOARD)/dts diff --git a/spl/Makefile b/spl/Makefile index 2a787af..b816e20 100644 --- a/spl/Makefile +++ b/spl/Makefile @@ -37,7 +37,7 @@ endif HAVE_VENDOR_COMMON_LIB = $(if $(wildcard $(SRCTREE)/board/$(VENDOR)/common/Makefile),y,n) ifdef CONFIG_SPL_START_S_PATH -START_PATH := $(subst ",,$(CONFIG_SPL_START_S_PATH)) +START_PATH := $(CONFIG_SPL_START_S_PATH:"%"=%) else START_PATH := $(CPUDIR) endif @@ -118,7 +118,7 @@ __LIBS := $(subst $(obj),,$(LIBS)) # Linker Script ifdef CONFIG_SPL_LDSCRIPT # need to strip off double quotes -LDSCRIPT := $(addprefix $(SRCTREE)/,$(subst ",,$(CONFIG_SPL_LDSCRIPT))) +LDSCRIPT := $(addprefix $(SRCTREE)/,$(CONFIG_SPL_LDSCRIPT:"%"=%)) endif ifeq ($(wildcard $(LDSCRIPT)),) -- 1.8.3.2

1 0

[U-Boot] [PATCH] drivers:power:exynos-tmu: add support for Exynos5260
by Naveen Krishna Chatradhi 05 Dec '13

05 Dec '13

This patch adds support for TMU on Exynos5260 Register bit fields are little different from the previous versions. Change-Id: Ibe835abe9cb255d2f8375c8e9e32d32cff19c093 Signed-off-by: Naveen Krishna Chatradhi <ch.naveen(a)samsung.com> --- arch/arm/include/asm/arch-exynos/tmu.h | 11 +++++++++++ drivers/power/exynos-tmu.c | 25 +++++++++++++++++++++++-- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/arch/arm/include/asm/arch-exynos/tmu.h b/arch/arm/include/asm/arch-exynos/tmu.h index cad3569..19b8f62 100644 --- a/arch/arm/include/asm/arch-exynos/tmu.h +++ b/arch/arm/include/asm/arch-exynos/tmu.h @@ -26,7 +26,11 @@ struct exynos5_tmu_reg { u32 triminfo_control; u32 rsvd5[2]; u32 tmu_control; +#ifdef CONFIG_EXYNOS5260 + u32 tmu_control1; +#else u32 rsvd7; +#endif u32 tmu_status; u32 sampling_internal; u32 counter_value0; @@ -41,10 +45,17 @@ struct exynos5_tmu_reg { u32 past_temp7_4; u32 past_temp11_8; u32 past_temp15_12; +#ifdef CONFIG_EXYNOS5260 + u32 rsvd15[16]; +#endif u32 inten; u32 intstat; u32 intclear; +#ifdef CONFIG_EXYNOS5260 + u32 rsvd31[17]; +#else u32 rsvd15; +#endif u32 emul_con; }; #endif /* __ASM_ARCH_TMU_H */ diff --git a/drivers/power/exynos-tmu.c b/drivers/power/exynos-tmu.c index 9a093a5..de3ff82 100644 --- a/drivers/power/exynos-tmu.c +++ b/drivers/power/exynos-tmu.c @@ -31,7 +31,13 @@ #define INTEN_RISE0 1 #define INTEN_RISE1 (1 << 4) #define INTEN_RISE2 (1 << 8) + +#ifdef CONFIG_EXYNOS5250 +#define INTEN_FALL0 (1 << 12) +#else #define INTEN_FALL0 (1 << 16) +#endif + #define INTEN_FALL1 (1 << 20) #define INTEN_FALL2 (1 << 24) @@ -43,9 +49,24 @@ #define INTCLEAR_FALL0 (1 << 16) #define INTCLEAR_FALL1 (1 << 20) #define INTCLEAR_FALL2 (1 << 24) + +#ifdef CONFIG_EXYNOS5260 +#define INTEN_RISE3 (1 << 12) +#define INTEN_FALL3 (1 << 28) +#define INTCLEAR_RISE3 (1 << 12) +#define INTCLEAR_FALL3 (1 << 28) +#endif + +#if defined(INTCLEAR_RISE3) && defined(INTCLEAR_FALL3) #define INTCLEARALL (INTCLEAR_RISE0 | INTCLEAR_RISE1 | \ - INTCLEAR_RISE2 | INTCLEAR_FALL0 | \ - INTCLEAR_FALL1 | INTCLEAR_FALL2) + INTCLEAR_RISE2 | INTCLEAR_RISE3 | \ + INTCLEAR_FALL0 | INTCLEAR_FALL1 | \ + INTCLEAR_FALL2 | INTCLEAR_FALL3) +#else +#define INTCLEARALL (INTCLEAR_RISE0 | INTCLEAR_RISE1 | \ + INTCLEAR_RISE2 | INTCLEAR_FALL0 | \ + INTCLEAR_FALL1 | INTCLEAR_FALL2) +#endif /* Tmeperature threshold values for various thermal events */ struct temperature_params { -- 1.7.10.4

3 3

[U-Boot] [PATCH 1/2] arm: exynos/goni: fix the return type for s5p_mmc_init
by Jaehoon Chung 05 Dec '13

05 Dec '13

The "int" type is right. Signed-off-by: Jaehoon Chung <jh80.chung(a)samsung.com> --- arch/arm/include/asm/arch-exynos/mmc.h | 2 +- arch/arm/include/asm/arch-s5pc1xx/mmc.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/include/asm/arch-exynos/mmc.h b/arch/arm/include/asm/arch-exynos/mmc.h index 98312d1..98d6530 100644 --- a/arch/arm/include/asm/arch-exynos/mmc.h +++ b/arch/arm/include/asm/arch-exynos/mmc.h @@ -55,7 +55,7 @@ int s5p_sdhci_init(u32 regbase, int index, int bus_width); -static inline unsigned int s5p_mmc_init(int index, int bus_width) +static inline int s5p_mmc_init(int index, int bus_width) { unsigned int base = samsung_get_base_mmc() + (S5P_MMC_DEV_OFFSET * index); diff --git a/arch/arm/include/asm/arch-s5pc1xx/mmc.h b/arch/arm/include/asm/arch-s5pc1xx/mmc.h index 55ff10b..dd473c8 100644 --- a/arch/arm/include/asm/arch-s5pc1xx/mmc.h +++ b/arch/arm/include/asm/arch-s5pc1xx/mmc.h @@ -55,7 +55,7 @@ int s5p_sdhci_init(u32 regbase, int index, int bus_width); -static inline unsigned int s5p_mmc_init(int index, int bus_width) +static inline int s5p_mmc_init(int index, int bus_width) { unsigned int base = samsung_get_base_mmc() + (S5P_MMC_DEV_OFFSET * index); -- 1.7.9.5

2 1