August 2014 - U-Boot

[U-Boot] [PATCH] arch/arm: Add individual TLB size support.
by Xiubo Li 18 Sep '14

18 Sep '14

This adds CONFIG_TLB_SIZE for individual board, whose TLB size maybe larger than PGTABLE_SIZE. Signed-off-by: Xiubo Li <Li.Xiubo(a)freescale.com> --- arch/arm/lib/board.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c index dc34190..b7327ce 100644 --- a/arch/arm/lib/board.c +++ b/arch/arm/lib/board.c @@ -353,7 +353,11 @@ void board_init_f(ulong bootflag) #if !(defined(CONFIG_SYS_ICACHE_OFF) && defined(CONFIG_SYS_DCACHE_OFF)) /* reserve TLB table */ +#ifdef CONFIG_TLB_SIZE + gd->arch.tlb_size = CONFIG_TLB_SIZE; +#else gd->arch.tlb_size = PGTABLE_SIZE; +#endif addr -= gd->arch.tlb_size; /* round down to next 64 kB limit */ -- 1.8.5

3 4

[U-Boot] [PATCH v2 2/2] doc: Use KBUILD_OUTPUT instead of BUILD_DIR
by Jagannadha Sutradharudu Teki 18 Sep '14

18 Sep '14

From: Jagannadha Sutradharudu Teki <jagannadh.teki(a)gmail.com> Now saving output files in a separate directory through KBUILD_OUTPUT not with BUILD_DIR, so updated the documentation accordingly. Signed-off-by: Jagannadha Sutradharudu Teki <jagannadh.teki(a)gmail.com> --- Changes for v2: - none MAKEALL | 12 ++++++------ README | 10 +++++----- doc/README.kwbimage | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/MAKEALL b/MAKEALL index 392ea8d..187770b 100755 --- a/MAKEALL +++ b/MAKEALL @@ -42,7 +42,7 @@ usage() architecture "ARCH". Substitute "ARCH" for any supported architecture (default: "") MAKEALL_LOGDIR output all logs to here (default: ./LOG/) - BUILD_DIR output build directory (default: ./) + KBUILD_OUTPUT output build directory (default: ./) BUILD_NBUILDS number of parallel targets (default: 1) Examples: @@ -223,14 +223,14 @@ BUILD_MANY=0 if [ "${BUILD_NBUILDS}" -gt 1 ] ; then BUILD_MANY=1 - : ${BUILD_DIR:=./build} - mkdir -p "${BUILD_DIR}/ERR" - find "${BUILD_DIR}/ERR/" -type f -exec rm -f {} + + : ${KBUILD_OUTPUT:=./build} + mkdir -p "${KBUILD_OUTPUT}/ERR" + find "${KBUILD_OUTPUT}/ERR/" -type f -exec rm -f {} + fi -: ${BUILD_DIR:=.} +: ${KBUILD_OUTPUT:=.} -OUTPUT_PREFIX="${BUILD_DIR}" +OUTPUT_PREFIX="${KBUILD_OUTPUT}" [ -d ${LOG_DIR} ] || mkdir "${LOG_DIR}" || exit 1 if [ "$CONTINUE" != 'y' -a "$REBUILD_ERRORS" != 'y' ] ; then diff --git a/README b/README index e88184b..8e05f69 100644 --- a/README +++ b/README @@ -4969,14 +4969,14 @@ this behavior and build U-Boot to some external directory: make O=/tmp/build NAME_defconfig make O=/tmp/build all -2. Set environment variable BUILD_DIR to point to the desired location: +2. Set environment variable KBUILD_OUTPUT to point to the desired location: - export BUILD_DIR=/tmp/build + export KBUILD_OUTPUT=/tmp/build make distclean make NAME_defconfig make all -Note that the command line "O=" setting overrides the BUILD_DIR environment +Note that the command line "O=" setting overrides the KBUILD_OUTPUT environment variable. @@ -5032,13 +5032,13 @@ or to build on a native PowerPC system you can type When using the MAKEALL script, the default behaviour is to build U-Boot in the source directory. This location can be changed by -setting the BUILD_DIR environment variable. Also, for each target +setting the KBUILD_OUTPUT environment variable. Also, for each target built, the MAKEALL script saves two log files (<target>.ERR and <target>.MAKEALL) in the <source dir>/LOG directory. This default location can be changed by setting the MAKEALL_LOGDIR environment variable. For example: - export BUILD_DIR=/tmp/build + export KBUILD_OUTPUT=/tmp/build export MAKEALL_LOGDIR=/tmp/log CROSS_COMPILE=ppc_8xx- MAKEALL diff --git a/doc/README.kwbimage b/doc/README.kwbimage index 13f6f92..8c02298 100644 --- a/doc/README.kwbimage +++ b/doc/README.kwbimage @@ -30,10 +30,10 @@ kwbimage support available with mkimage utility will generate kirkwood boot image that can be flashed on the board NAND/SPI flash. The make target which uses mkimage to produce such an image is "u-boot.kwb". For example: - export BUILD_DIR=/tmp/build + export KBUILD_OUTPUT=/tmp/build make distclean make yourboard_config - make $BUILD_DIR/u-boot.kwb + make $KBUILD_OUTPUT/u-boot.kwb Board specific configuration file specifications: -- 2.0.0.rc1.4.gd8779e1

2 1

[U-Boot] [PATCH] kbuild: force to define __UBOOT__ in all the C sources
by Masahiro Yamada 17 Sep '14

17 Sep '14

U-Boot has imported various source files from other projects, mostly Linux. Something like #ifdef __UBOOT__ [ modification for U-Boot ] #else [ original code ] #endif is an often used strategy for clarification of adjusted parts, that is, easier re-sync in future. Instead of defining __UBOOT__ in each source file, passing it from the top Makefile would be easier. Signed-off-by: Masahiro Yamada <yamada.m(a)jp.panasonic.com> --- I built all the boards and comfirmed the same results are produced with/without this patch. Makefile | 2 +- drivers/mtd/mtdconcat.c | 1 - drivers/mtd/mtdcore.c | 1 - drivers/mtd/mtdpart.c | 1 - drivers/mtd/nand/nand_base.c | 1 - drivers/mtd/nand/nand_bbt.c | 1 - drivers/mtd/nand/nand_ids.c | 1 - drivers/mtd/ubi/attach.c | 1 - drivers/mtd/ubi/build.c | 1 - drivers/mtd/ubi/crc32.c | 1 - drivers/mtd/ubi/debug.c | 1 - drivers/mtd/ubi/debug.h | 1 - drivers/mtd/ubi/eba.c | 1 - drivers/mtd/ubi/fastmap.c | 1 - drivers/mtd/ubi/io.c | 1 - drivers/mtd/ubi/kapi.c | 1 - drivers/mtd/ubi/ubi.h | 1 - drivers/mtd/ubi/upd.c | 1 - drivers/mtd/ubi/vmt.c | 1 - drivers/mtd/ubi/vtbl.c | 1 - drivers/mtd/ubi/wl.c | 1 - drivers/usb/musb-new/am35x.c | 1 - drivers/usb/musb-new/musb_core.c | 1 - drivers/usb/musb-new/musb_dsps.c | 1 - drivers/usb/musb-new/musb_gadget.c | 1 - drivers/usb/musb-new/musb_gadget_ep0.c | 1 - drivers/usb/musb-new/musb_host.c | 1 - drivers/usb/musb-new/musb_uboot.c | 1 - drivers/usb/musb-new/omap2430.c | 1 - fs/ubifs/budget.c | 1 - fs/ubifs/debug.c | 1 - fs/ubifs/debug.h | 1 - fs/ubifs/io.c | 1 - fs/ubifs/log.c | 1 - fs/ubifs/lprops.c | 1 - fs/ubifs/lpt.c | 1 - fs/ubifs/lpt_commit.c | 1 - fs/ubifs/master.c | 1 - fs/ubifs/misc.h | 1 - fs/ubifs/recovery.c | 1 - fs/ubifs/replay.c | 1 - fs/ubifs/sb.c | 1 - fs/ubifs/scan.c | 1 - fs/ubifs/super.c | 1 - fs/ubifs/tnc.c | 1 - fs/ubifs/tnc_misc.c | 1 - fs/ubifs/ubifs.c | 1 - fs/ubifs/ubifs.h | 1 - include/linux/mtd/flashchip.h | 1 - include/linux/mtd/mtd.h | 1 - include/linux/mtd/nand.h | 1 - include/linux/mtd/ubi.h | 1 - include/linux/rbtree.h | 1 - include/mtd/mtd-abi.h | 1 - lib/list_sort.c | 1 - lib/rbtree.c | 1 - 56 files changed, 1 insertion(+), 56 deletions(-) diff --git a/Makefile b/Makefile index 9646859..0930661 100644 --- a/Makefile +++ b/Makefile @@ -341,7 +341,7 @@ CHECK = sparse CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \ -Wbitwise -Wno-return-void -D__CHECK_ENDIAN__ $(CF) -KBUILD_CPPFLAGS := -D__KERNEL__ +KBUILD_CPPFLAGS := -D__KERNEL__ -D__UBOOT__ KBUILD_CFLAGS := -Wall -Wstrict-prototypes \ -Wno-format-security \ diff --git a/drivers/mtd/mtdconcat.c b/drivers/mtd/mtdconcat.c index 39daeab..3e36918 100644 --- a/drivers/mtd/mtdconcat.c +++ b/drivers/mtd/mtdconcat.c @@ -10,7 +10,6 @@ * */ -#define __UBOOT__ #ifndef __UBOOT__ #include <linux/kernel.h> #include <linux/module.h> diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c index 6ad0357..e0b7e3a 100644 --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c @@ -9,7 +9,6 @@ * */ -#define __UBOOT__ #ifndef __UBOOT__ #include <linux/module.h> #include <linux/kernel.h> diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c index 2f20b92..cfbaa3d 100644 --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c @@ -9,7 +9,6 @@ * */ -#define __UBOOT__ #ifndef __UBOOT__ #include <linux/module.h> #include <linux/types.h> diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index 085b154..7153e3c 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -29,7 +29,6 @@ * */ -#define __UBOOT__ #ifndef __UBOOT__ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt diff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c index c8f28c7..cf4a82d 100644 --- a/drivers/mtd/nand/nand_bbt.c +++ b/drivers/mtd/nand/nand_bbt.c @@ -59,7 +59,6 @@ * */ -#define __UBOOT__ #ifndef __UBOOT__ #include <linux/slab.h> #include <linux/types.h> diff --git a/drivers/mtd/nand/nand_ids.c b/drivers/mtd/nand/nand_ids.c index 54f9f13..9ed0577 100644 --- a/drivers/mtd/nand/nand_ids.c +++ b/drivers/mtd/nand/nand_ids.c @@ -8,7 +8,6 @@ * published by the Free Software Foundation. * */ -#define __UBOOT__ #ifndef __UBOOT__ #include <linux/module.h> #include <linux/mtd/nand.h> diff --git a/drivers/mtd/ubi/attach.c b/drivers/mtd/ubi/attach.c index 9fce02e..1bdbfa7 100644 --- a/drivers/mtd/ubi/attach.c +++ b/drivers/mtd/ubi/attach.c @@ -70,7 +70,6 @@ * o Otherwise this is corruption type 2. */ -#define __UBOOT__ #ifndef __UBOOT__ #include <linux/err.h> #include <linux/slab.h> diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c index ff8bf0c..584cf5f 100644 --- a/drivers/mtd/ubi/build.c +++ b/drivers/mtd/ubi/build.c @@ -17,7 +17,6 @@ * later using the "UBI control device". */ -#define __UBOOT__ #ifndef __UBOOT__ #include <linux/module.h> #include <linux/moduleparam.h> diff --git a/drivers/mtd/ubi/crc32.c b/drivers/mtd/ubi/crc32.c index 0d65bf4..9c54ea4 100644 --- a/drivers/mtd/ubi/crc32.c +++ b/drivers/mtd/ubi/crc32.c @@ -20,7 +20,6 @@ * Version 2. See the file COPYING for more details. */ -#define __UBOOT__ #ifndef __UBOOT__ #include <linux/crc32.h> #include <linux/kernel.h> diff --git a/drivers/mtd/ubi/debug.c b/drivers/mtd/ubi/debug.c index af254da..6dcc4e4 100644 --- a/drivers/mtd/ubi/debug.c +++ b/drivers/mtd/ubi/debug.c @@ -8,7 +8,6 @@ #include <ubi_uboot.h> #include "ubi.h" -#define __UBOOT__ #ifndef __UBOOT__ #include <linux/debugfs.h> #include <linux/uaccess.h> diff --git a/drivers/mtd/ubi/debug.h b/drivers/mtd/ubi/debug.h index 980eb11..bfa9dfb 100644 --- a/drivers/mtd/ubi/debug.h +++ b/drivers/mtd/ubi/debug.h @@ -13,7 +13,6 @@ void ubi_dump_flash(struct ubi_device *ubi, int pnum, int offset, int len); void ubi_dump_ec_hdr(const struct ubi_ec_hdr *ec_hdr); void ubi_dump_vid_hdr(const struct ubi_vid_hdr *vid_hdr); -#define __UBOOT__ #ifndef __UBOOT__ #include <linux/random.h> #endif diff --git a/drivers/mtd/ubi/eba.c b/drivers/mtd/ubi/eba.c index 3c2a7e6..fce0ff8 100644 --- a/drivers/mtd/ubi/eba.c +++ b/drivers/mtd/ubi/eba.c @@ -29,7 +29,6 @@ * 64 bits is enough to never overflow. */ -#define __UBOOT__ #ifndef __UBOOT__ #include <linux/slab.h> #include <linux/crc32.h> diff --git a/drivers/mtd/ubi/fastmap.c b/drivers/mtd/ubi/fastmap.c index 787522f..a2166e4 100644 --- a/drivers/mtd/ubi/fastmap.c +++ b/drivers/mtd/ubi/fastmap.c @@ -6,7 +6,6 @@ * */ -#define __UBOOT__ #ifndef __UBOOT__ #include <linux/crc32.h> #else diff --git a/drivers/mtd/ubi/io.c b/drivers/mtd/ubi/io.c index 41d7eb7..0e2e933 100644 --- a/drivers/mtd/ubi/io.c +++ b/drivers/mtd/ubi/io.c @@ -73,7 +73,6 @@ * back and writes the whole sub-page. */ -#define __UBOOT__ #ifndef __UBOOT__ #include <linux/crc32.h> #include <linux/err.h> diff --git a/drivers/mtd/ubi/kapi.c b/drivers/mtd/ubi/kapi.c index 0183c93..fd2bbd6 100644 --- a/drivers/mtd/ubi/kapi.c +++ b/drivers/mtd/ubi/kapi.c @@ -8,7 +8,6 @@ /* This file mostly implements UBI kernel API functions */ -#define __UBOOT__ #ifndef __UBOOT__ #include <linux/module.h> #include <linux/slab.h> diff --git a/drivers/mtd/ubi/ubi.h b/drivers/mtd/ubi/ubi.h index 20fd704..754b337 100644 --- a/drivers/mtd/ubi/ubi.h +++ b/drivers/mtd/ubi/ubi.h @@ -10,7 +10,6 @@ #ifndef __UBI_UBI_H__ #define __UBI_UBI_H__ -#define __UBOOT__ #ifndef __UBOOT__ #include <linux/types.h> #include <linux/list.h> diff --git a/drivers/mtd/ubi/upd.c b/drivers/mtd/ubi/upd.c index 220c120..c52c9ce 100644 --- a/drivers/mtd/ubi/upd.c +++ b/drivers/mtd/ubi/upd.c @@ -26,7 +26,6 @@ * transaction with a roll-back capability. */ -#define __UBOOT__ #ifndef __UBOOT__ #include <linux/uaccess.h> #else diff --git a/drivers/mtd/ubi/vmt.c b/drivers/mtd/ubi/vmt.c index d9665a4..f4392f5 100644 --- a/drivers/mtd/ubi/vmt.c +++ b/drivers/mtd/ubi/vmt.c @@ -11,7 +11,6 @@ * resizing. */ -#define __UBOOT__ #ifndef __UBOOT__ #include <linux/err.h> #include <linux/slab.h> diff --git a/drivers/mtd/ubi/vtbl.c b/drivers/mtd/ubi/vtbl.c index e6c8f5b..ae8ea38 100644 --- a/drivers/mtd/ubi/vtbl.c +++ b/drivers/mtd/ubi/vtbl.c @@ -43,7 +43,6 @@ * damaged. */ -#define __UBOOT__ #ifndef __UBOOT__ #include <linux/crc32.h> #include <linux/err.h> diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c index 1023090..6886f89 100644 --- a/drivers/mtd/ubi/wl.c +++ b/drivers/mtd/ubi/wl.c @@ -86,7 +86,6 @@ * room for future re-works of the WL sub-system. */ -#define __UBOOT__ #ifndef __UBOOT__ #include <linux/slab.h> #include <linux/crc32.h> diff --git a/drivers/usb/musb-new/am35x.c b/drivers/usb/musb-new/am35x.c index 57c9bd3..857d7eb 100644 --- a/drivers/usb/musb-new/am35x.c +++ b/drivers/usb/musb-new/am35x.c @@ -26,7 +26,6 @@ * */ -#define __UBOOT__ #ifndef __UBOOT__ #include <linux/init.h> #include <linux/module.h> diff --git a/drivers/usb/musb-new/musb_core.c b/drivers/usb/musb-new/musb_core.c index 36681b6..4edd6d7 100644 --- a/drivers/usb/musb-new/musb_core.c +++ b/drivers/usb/musb-new/musb_core.c @@ -89,7 +89,6 @@ * Most of the conditional compilation will (someday) vanish. */ -#define __UBOOT__ #ifndef __UBOOT__ #include <linux/module.h> #include <linux/kernel.h> diff --git a/drivers/usb/musb-new/musb_dsps.c b/drivers/usb/musb-new/musb_dsps.c index 9a03917..17ed224 100644 --- a/drivers/usb/musb-new/musb_dsps.c +++ b/drivers/usb/musb-new/musb_dsps.c @@ -29,7 +29,6 @@ * da8xx.c would be merged to this file after testing. */ -#define __UBOOT__ #ifndef __UBOOT__ #include <linux/init.h> #include <linux/io.h> diff --git a/drivers/usb/musb-new/musb_gadget.c b/drivers/usb/musb-new/musb_gadget.c index d2cb91a..97acf93 100644 --- a/drivers/usb/musb-new/musb_gadget.c +++ b/drivers/usb/musb-new/musb_gadget.c @@ -33,7 +33,6 @@ * */ -#define __UBOOT__ #ifndef __UBOOT__ #include <linux/kernel.h> #include <linux/list.h> diff --git a/drivers/usb/musb-new/musb_gadget_ep0.c b/drivers/usb/musb-new/musb_gadget_ep0.c index 8c3b0a1..5a71501 100644 --- a/drivers/usb/musb-new/musb_gadget_ep0.c +++ b/drivers/usb/musb-new/musb_gadget_ep0.c @@ -33,7 +33,6 @@ * */ -#define __UBOOT__ #ifndef __UBOOT__ #include <linux/kernel.h> #include <linux/list.h> diff --git a/drivers/usb/musb-new/musb_host.c b/drivers/usb/musb-new/musb_host.c index 9a2cf59..bbcee88 100644 --- a/drivers/usb/musb-new/musb_host.c +++ b/drivers/usb/musb-new/musb_host.c @@ -33,7 +33,6 @@ * */ -#define __UBOOT__ #ifndef __UBOOT__ #include <linux/module.h> #include <linux/kernel.h> diff --git a/drivers/usb/musb-new/musb_uboot.c b/drivers/usb/musb-new/musb_uboot.c index 0d7b89f..2676f09 100644 --- a/drivers/usb/musb-new/musb_uboot.c +++ b/drivers/usb/musb-new/musb_uboot.c @@ -4,7 +4,6 @@ #include <linux/usb/ch9.h> #include <linux/usb/gadget.h> -#define __UBOOT__ #include <usb.h> #include "linux-compat.h" #include "usb-compat.h" diff --git a/drivers/usb/musb-new/omap2430.c b/drivers/usb/musb-new/omap2430.c index b1c4dc7..98f4830 100644 --- a/drivers/usb/musb-new/omap2430.c +++ b/drivers/usb/musb-new/omap2430.c @@ -24,7 +24,6 @@ * Suite 330, Boston, MA 02111-1307 USA * */ -#define __UBOOT__ #ifndef __UBOOT__ #include <linux/module.h> #include <linux/kernel.h> diff --git a/fs/ubifs/budget.c b/fs/ubifs/budget.c index 9ed4017..c626cbf 100644 --- a/fs/ubifs/budget.c +++ b/fs/ubifs/budget.c @@ -20,7 +20,6 @@ */ #include "ubifs.h" -#define __UBOOT__ #ifndef __UBOOT__ #include <linux/writeback.h> #else diff --git a/fs/ubifs/debug.c b/fs/ubifs/debug.c index 2f50a55..6e6f018 100644 --- a/fs/ubifs/debug.c +++ b/fs/ubifs/debug.c @@ -16,7 +16,6 @@ * various local functions of those subsystems. */ -#define __UBOOT__ #ifndef __UBOOT__ #include <linux/module.h> #include <linux/debugfs.h> diff --git a/fs/ubifs/debug.h b/fs/ubifs/debug.h index 6d325af..807ce1b 100644 --- a/fs/ubifs/debug.h +++ b/fs/ubifs/debug.h @@ -12,7 +12,6 @@ #ifndef __UBIFS_DEBUG_H__ #define __UBIFS_DEBUG_H__ -#define __UBOOT__ /* Checking helper functions */ typedef int (*dbg_leaf_callback)(struct ubifs_info *c, struct ubifs_zbranch *zbr, void *priv); diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c index f87341e..bdccdc4 100644 --- a/fs/ubifs/io.c +++ b/fs/ubifs/io.c @@ -59,7 +59,6 @@ * they are read from the flash media. */ -#define __UBOOT__ #ifndef __UBOOT__ #include <linux/crc32.h> #include <linux/slab.h> diff --git a/fs/ubifs/log.c b/fs/ubifs/log.c index ced0424..0355fe2 100644 --- a/fs/ubifs/log.c +++ b/fs/ubifs/log.c @@ -16,7 +16,6 @@ * journal. */ -#define __UBOOT__ #ifdef __UBOOT__ #include <linux/err.h> #endif diff --git a/fs/ubifs/lprops.c b/fs/ubifs/lprops.c index fc6686b..a1a814f 100644 --- a/fs/ubifs/lprops.c +++ b/fs/ubifs/lprops.c @@ -17,7 +17,6 @@ * an empty LEB for the journal, or a very dirty LEB for garbage collection. */ -#define __UBOOT__ #ifdef __UBOOT__ #include <linux/err.h> #endif diff --git a/fs/ubifs/lpt.c b/fs/ubifs/lpt.c index c49d3b0..8489e90 100644 --- a/fs/ubifs/lpt.c +++ b/fs/ubifs/lpt.c @@ -33,7 +33,6 @@ */ #include "ubifs.h" -#define __UBOOT__ #ifndef __UBOOT__ #include <linux/crc16.h> #include <linux/math64.h> diff --git a/fs/ubifs/lpt_commit.c b/fs/ubifs/lpt_commit.c index cad422e..c818d4c 100644 --- a/fs/ubifs/lpt_commit.c +++ b/fs/ubifs/lpt_commit.c @@ -14,7 +14,6 @@ * subsystem. */ -#define __UBOOT__ #ifndef __UBOOT__ #include <linux/crc16.h> #include <linux/slab.h> diff --git a/fs/ubifs/master.c b/fs/ubifs/master.c index 00ca855..761e070 100644 --- a/fs/ubifs/master.c +++ b/fs/ubifs/master.c @@ -11,7 +11,6 @@ /* This file implements reading and writing the master node */ -#define __UBOOT__ #include "ubifs.h" #ifdef __UBOOT__ #include <linux/compat.h> diff --git a/fs/ubifs/misc.h b/fs/ubifs/misc.h index 4316d3c..7cad2be 100644 --- a/fs/ubifs/misc.h +++ b/fs/ubifs/misc.h @@ -16,7 +16,6 @@ #ifndef __UBIFS_MISC_H__ #define __UBIFS_MISC_H__ -#define __UBOOT__ /** * ubifs_zn_dirty - check if znode is dirty. * @znode: znode to check diff --git a/fs/ubifs/recovery.c b/fs/ubifs/recovery.c index f54a440..7637707 100644 --- a/fs/ubifs/recovery.c +++ b/fs/ubifs/recovery.c @@ -36,7 +36,6 @@ * refuses to mount. */ -#define __UBOOT__ #ifndef __UBOOT__ #include <linux/crc32.h> #include <linux/slab.h> diff --git a/fs/ubifs/replay.c b/fs/ubifs/replay.c index 6393b15..7268b37 100644 --- a/fs/ubifs/replay.c +++ b/fs/ubifs/replay.c @@ -21,7 +21,6 @@ * larger is the journal, the more memory its index may consume. */ -#define __UBOOT__ #ifdef __UBOOT__ #include <linux/compat.h> #include <linux/err.h> diff --git a/fs/ubifs/sb.c b/fs/ubifs/sb.c index fc0194a..4983bf6 100644 --- a/fs/ubifs/sb.c +++ b/fs/ubifs/sb.c @@ -16,7 +16,6 @@ */ #include "ubifs.h" -#define __UBOOT__ #ifndef __UBOOT__ #include <linux/slab.h> #include <linux/random.h> diff --git a/fs/ubifs/scan.c b/fs/ubifs/scan.c index 5523d4e..6fc464b 100644 --- a/fs/ubifs/scan.c +++ b/fs/ubifs/scan.c @@ -16,7 +16,6 @@ * debugging functions. */ -#define __UBOOT__ #ifdef __UBOOT__ #include <linux/err.h> #endif diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c index dd9b668..01d449a 100644 --- a/fs/ubifs/super.c +++ b/fs/ubifs/super.c @@ -15,7 +15,6 @@ * corresponding subsystems, but most of it is here. */ -#define __UBOOT__ #ifndef __UBOOT__ #include <linux/init.h> #include <linux/slab.h> diff --git a/fs/ubifs/tnc.c b/fs/ubifs/tnc.c index eda5070..95cae54 100644 --- a/fs/ubifs/tnc.c +++ b/fs/ubifs/tnc.c @@ -19,7 +19,6 @@ * the mutex locked. */ -#define __UBOOT__ #ifndef __UBOOT__ #include <linux/crc32.h> #include <linux/slab.h> diff --git a/fs/ubifs/tnc_misc.c b/fs/ubifs/tnc_misc.c index 81bdad9..f808e0b 100644 --- a/fs/ubifs/tnc_misc.c +++ b/fs/ubifs/tnc_misc.c @@ -16,7 +16,6 @@ * putting it all in one file would make that file too big and unreadable. */ -#define __UBOOT__ #ifdef __UBOOT__ #include <linux/err.h> #endif diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c index b91a6fd..49e6f46 100644 --- a/fs/ubifs/ubifs.c +++ b/fs/ubifs/ubifs.c @@ -26,7 +26,6 @@ #include "ubifs.h" #include <u-boot/zlib.h> -#define __UBOOT__ #include <linux/err.h> #include <linux/lzo.h> diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h index acc6a40..0ce2475 100644 --- a/fs/ubifs/ubifs.h +++ b/fs/ubifs/ubifs.h @@ -15,7 +15,6 @@ #ifndef __UBIFS_H__ #define __UBIFS_H__ -#define __UBOOT__ #ifndef __UBOOT__ #include <asm/div64.h> #include <linux/statfs.h> diff --git a/include/linux/mtd/flashchip.h b/include/linux/mtd/flashchip.h index 7028ee1..e5c7d1c 100644 --- a/include/linux/mtd/flashchip.h +++ b/include/linux/mtd/flashchip.h @@ -9,7 +9,6 @@ #ifndef __MTD_FLASHCHIP_H__ #define __MTD_FLASHCHIP_H__ -#define __UBOOT__ #ifndef __UBOOT__ /* For spinlocks. sched.h includes spinlock.h from whichever directory it * happens to be in - so we don't have to care whether we're on 2.2, which diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h index 1526d07..8666413 100644 --- a/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h @@ -8,7 +8,6 @@ #ifndef __MTD_MTD_H__ #define __MTD_MTD_H__ -#define __UBOOT__ #ifndef __UBOOT__ #include <linux/types.h> #include <linux/uio.h> diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h index 67d2651..8438490 100644 --- a/include/linux/mtd/nand.h +++ b/include/linux/mtd/nand.h @@ -16,7 +16,6 @@ #ifndef __LINUX_MTD_NAND_H #define __LINUX_MTD_NAND_H -#define __UBOOT__ #ifndef __UBOOT__ #include <linux/wait.h> #include <linux/spinlock.h> diff --git a/include/linux/mtd/ubi.h b/include/linux/mtd/ubi.h index d9e58ae..05d0ab5 100644 --- a/include/linux/mtd/ubi.h +++ b/include/linux/mtd/ubi.h @@ -10,7 +10,6 @@ #define __LINUX_UBI_H__ #include <linux/types.h> -#define __UBOOT__ #ifndef __UBOOT__ #include <linux/ioctl.h> #include <mtd/ubi-user.h> diff --git a/include/linux/rbtree.h b/include/linux/rbtree.h index b5994e3..2cc16a3 100644 --- a/include/linux/rbtree.h +++ b/include/linux/rbtree.h @@ -17,7 +17,6 @@ #ifndef _LINUX_RBTREE_H #define _LINUX_RBTREE_H -#define __UBOOT__ #ifndef __UBOOT__ #include <linux/kernel.h> #endif diff --git a/include/mtd/mtd-abi.h b/include/mtd/mtd-abi.h index b9f4bcb..0ef582a 100644 --- a/include/mtd/mtd-abi.h +++ b/include/mtd/mtd-abi.h @@ -8,7 +8,6 @@ #ifndef __MTD_ABI_H__ #define __MTD_ABI_H__ -#define __UBOOT__ #ifdef __UBOOT__ #include <linux/compat.h> #endif diff --git a/lib/list_sort.c b/lib/list_sort.c index 81de0a1..e841da5 100644 --- a/lib/list_sort.c +++ b/lib/list_sort.c @@ -1,4 +1,3 @@ -#define __UBOOT__ #ifndef __UBOOT__ #include <linux/kernel.h> #include <linux/module.h> diff --git a/lib/rbtree.c b/lib/rbtree.c index 9e52f70..5de3bf4 100644 --- a/lib/rbtree.c +++ b/lib/rbtree.c @@ -9,7 +9,6 @@ linux/lib/rbtree.c */ -#define __UBOOT__ #include <linux/rbtree_augmented.h> #ifndef __UBOOT__ #include <linux/export.h> -- 1.9.1

4 3

[U-Boot] [PATCH] openrisc: Fix a few type cast related warnings
by Vasili Galka 17 Sep '14

17 Sep '14

Use size_t type for positive offsets instead of the loff_t type. The later is defined as long long, which is larger than the pointer type on OpenRISC architecture and therefore the following warning was generated: "warning: cast to pointer from integer of different size" Signed-off-by: Vasili Galka <vvv444(a)gmail.com> --- drivers/net/ethoc.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c index af06d4f..46c82bb 100644 --- a/drivers/net/ethoc.c +++ b/drivers/net/ethoc.c @@ -189,12 +189,12 @@ struct ethoc_bd { u32 addr; }; -static inline u32 ethoc_read(struct eth_device *dev, loff_t offset) +static inline u32 ethoc_read(struct eth_device *dev, size_t offset) { return readl(dev->iobase + offset); } -static inline void ethoc_write(struct eth_device *dev, loff_t offset, u32 data) +static inline void ethoc_write(struct eth_device *dev, size_t offset, u32 data) { writel(data, dev->iobase + offset); } @@ -202,7 +202,7 @@ static inline void ethoc_write(struct eth_device *dev, loff_t offset, u32 data) static inline void ethoc_read_bd(struct eth_device *dev, int index, struct ethoc_bd *bd) { - loff_t offset = ETHOC_BD_BASE + (index * sizeof(struct ethoc_bd)); + size_t offset = ETHOC_BD_BASE + (index * sizeof(struct ethoc_bd)); bd->stat = ethoc_read(dev, offset + 0); bd->addr = ethoc_read(dev, offset + 4); } @@ -210,7 +210,7 @@ static inline void ethoc_read_bd(struct eth_device *dev, int index, static inline void ethoc_write_bd(struct eth_device *dev, int index, const struct ethoc_bd *bd) { - loff_t offset = ETHOC_BD_BASE + (index * sizeof(struct ethoc_bd)); + size_t offset = ETHOC_BD_BASE + (index * sizeof(struct ethoc_bd)); ethoc_write(dev, offset + 0, bd->stat); ethoc_write(dev, offset + 4, bd->addr); } -- 1.7.9

2 1

[U-Boot] [PATCH] Fix a few printf argument verification warnings
by Vasili Galka 17 Sep '14

17 Sep '14

The parameters of size_t type shall be formatted using "%zu" and not using "%d". Precision argument for the "%.*s" parameters shall be of int type. Signed-off-by: Vasili Galka <vvv444(a)gmail.com> --- common/bouncebuf.c | 2 +- common/cmd_mtdparts.c | 4 ++-- common/spl/spl.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/bouncebuf.c b/common/bouncebuf.c index 9eece6d..054d9e0 100644 --- a/common/bouncebuf.c +++ b/common/bouncebuf.c @@ -23,7 +23,7 @@ static int addr_aligned(struct bounce_buffer *state) /* Check if length is aligned */ if (state->len != state->len_aligned) { - debug("Unaligned buffer length %d\n", state->len); + debug("Unaligned buffer length %zu\n", state->len); return 0; } diff --git a/common/cmd_mtdparts.c b/common/cmd_mtdparts.c index 40b6333..d793f74 100644 --- a/common/cmd_mtdparts.c +++ b/common/cmd_mtdparts.c @@ -861,7 +861,7 @@ static int device_parse(const char *const mtd_dev, const char **ret, struct mtd_ debug("dev type = %d (%s), dev num = %d, mtd-id = %s\n", id->type, MTD_DEV_TYPE(id->type), id->num, id->mtd_id); - debug("parsing partitions %.*s\n", (pend ? pend - p : strlen(p)), p); + debug("parsing partitions %.*s\n", (int)(pend ? pend - p : strlen(p)), p); /* parse partitions */ @@ -1006,7 +1006,7 @@ static struct mtdids* id_find_by_mtd_id(const char *mtd_id, unsigned int mtd_id_ list_for_each(entry, &mtdids) { id = list_entry(entry, struct mtdids, link); - debug("entry: '%s' (len = %d)\n", + debug("entry: '%s' (len = %zu)\n", id->mtd_id, strlen(id->mtd_id)); if (mtd_id_len != strlen(id->mtd_id)) diff --git a/common/spl/spl.c b/common/spl/spl.c index 774fdad..b16664f 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -86,7 +86,7 @@ void spl_parse_image_header(const struct image_header *header) spl_image.os = image_get_os(header); spl_image.name = image_get_name(header); debug("spl: payload image: %.*s load addr: 0x%x size: %d\n", - sizeof(spl_image.name), spl_image.name, + (int)sizeof(spl_image.name), spl_image.name, spl_image.load_addr, spl_image.size); } else { /* Signature not found - assume u-boot.bin */ -- 1.7.9

2 1

[U-Boot] [PATCH] cosmetic: README.scrapyard: add NIOS2 boards
by Masahiro Yamada 17 Sep '14

17 Sep '14

Commit 70fbc461 removed obsolete PCI5441 and PK1C20 boards. This commit adds them to README.scrapyard and also fills some commit IDs and dates for removed boards. Signed-off-by: Masahiro Yamada <yamada.m(a)jp.panasonic.com> Cc: Thomas Chou <thomas(a)wytron.com.tw> --- doc/README.scrapyard | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/doc/README.scrapyard b/doc/README.scrapyard index 7ef5a22..2f5034f 100644 --- a/doc/README.scrapyard +++ b/doc/README.scrapyard @@ -12,12 +12,14 @@ The list should be sorted in reverse chronological order. Board Arch CPU Commit Removed Last known maintainer/contact ================================================================================================= -flagadm powerpc mpc8xx - - Kári Davíðsson <kd(a)flaga.is> -gen860t powerpc mpc8xx - - Keith Outwater <Keith_Outwater(a)mvis.com> -sixnet powerpc mpc8xx - - Dave Ellis <DGE(a)sixnetio.com> -svm_sc8xx powerpc mpc8xx - - John Zhan <zhanz(a)sinovee.com> -stxxtc powerpc mpc8xx - - Dan Malek <dan(a)embeddedalley.com> -omap5912osk arm arm926ejs - - Rishi Bhattacharya <rishi(a)ti.com> +PK1C20 nios2 - 70fbc461 2014-08-24 Scott McNutt <smcnutt(a)psyent.com> +PCI5441 nios2 - 70fbc461 2014-08-24 Scott McNutt <smcnutt(a)psyent.com> +flagadm powerpc mpc8xx aec6f8c5 2014-08-22 Kári Davíðsson <kd(a)flaga.is> +gen860t powerpc mpc8xx 6bde1ec1 2014-08-22 Keith Outwater <Keith_Outwater(a)mvis.com> +sixnet powerpc mpc8xx 4723ce49 2014-08-22 Dave Ellis <DGE(a)sixnetio.com> +svm_sc8xx powerpc mpc8xx d1a4aafd 2014-08-22 John Zhan <zhanz(a)sinovee.com> +stxxtc powerpc mpc8xx 0ace4d9d 2014-08-22 Dan Malek <dan(a)embeddedalley.com> +omap5912osk arm arm926ejs 62d636aa 2014-08-22 Rishi Bhattacharya <rishi(a)ti.com> p1023rds powerpc mpc85xx d0bc5140 2014-07-22 Roy Zang <tie-fei.zang(a)freescale.com> spc1920 powerpc mpc8xx 98ad54be 2014-07-07 v37 powerpc mpc8xx b8c1438a 2014-07-07 -- 1.9.1

3 2

[U-Boot] [PATCH 0/3] Initial cleanup of arm port timer subsystem
by andrew.ruder＠elecsyscorp.com 16 Sep '14

16 Sep '14

From: Andrew Ruder <andrew.ruder(a)elecsyscorp.com> Hey all, Was tracking down an issue on a PXA270 based board where a long y-modem transfer would frequently deadlock the board in the middle of the transfer. Unfortunately I felt like I had opened pandora's box by looking around at other ports. Very few ports were 32-bit rollover safe! Most looked like they would just skip a __udelay on roll-over. These are fixes for the couple I noticed that would potentially deadlock if __udelay crossed the 32-bit boundary. And some are so complicated that I didn't waste time looking at them. get_ticks() which returns a unsigned long long had a variety of implementations. Some returned a number that wrapped at 32 bits which worked with some implementations of __udelay. Others returned a number that wraps at a fraction of 32-bits which would hit the roll-over issues at an unexpected place and fail even more often. There is a lot of opportunity here for tons of code removal by moving more ports to the common code. Here are some notes that I took while going through some that might save someone some time. This was a very cursory look so my apologies if I have missed something. ** u-boot/arch/arm/cpu/arm1136/mx31/timer.c:98:20:unsigned long long get_ticks(void) get_ticks() returns 32-bit number __udelay() depends on 64-bit value - HANGS ** u-boot/arch/arm/cpu/arm1136/mx35/timer.c:75:20:unsigned long long get_ticks(void) get_ticks() returns 32-bit number __udelay() depends on 64-bit value - HANGS ** u-boot/arch/arm/cpu/arm1176/bcm2835/timer.c:37:20:unsigned long long get_ticks(void) get_ticks() returns 32-bit number __udelay() is safe ** u-boot/arch/arm/cpu/arm1176/tnetv107x/timer.c:67:20:unsigned long long get_ticks(void) get_ticks() isn't even a 32-bit number __udelay() is safe ** u-boot/arch/arm/cpu/arm920t/a320/timer.c:74:20:unsigned long long get_ticks(void) get_ticks() returns 64-bit number __udelay() is safe ** u-boot/arch/arm/cpu/arm920t/at91/timer.c:115:20:unsigned long long get_ticks(void) get_ticks() isn't even a 32-bit number __udelay() is safe ** u-boot/arch/arm/cpu/arm920t/ep93xx/timer.c:58:20:unsigned long long get_ticks(void) get_ticks() returns 64-bit number __udelay() is safe until 64-bit rollover ** u-boot/arch/arm/cpu/arm920t/imx/timer.c:70:20:unsigned long long get_ticks(void) get_ticks() returns a 32-bit number __udelay is safe ** u-boot/arch/arm/cpu/arm920t/s3c24x0/timer.c:110:20:unsigned long long get_ticks(void) get_ticks() is complicated. tbu abused for something else __udelay might be safe? It handles 32-bit rollover correctly if get_ticks() is really a 32-bit number ** u-boot/arch/arm/cpu/arm926ejs/armada100/timer.c:182:20:unsigned long long get_ticks(void) get_ticks() isn't a 32-bit number __udelay completely doesn't handle roll-over ** u-boot/arch/arm/cpu/arm926ejs/at91/timer.c:75:20:unsigned long long get_ticks(void) get_ticks() returns 64-bit number __udelay handles roll-over looks perfect ** u-boot/arch/arm/cpu/arm926ejs/davinci/timer.c:56:20:unsigned long long get_ticks(void) get_ticks() returns 64-bit number chooses to ignore roll-over ** u-boot/arch/arm/cpu/arm926ejs/kirkwood/timer.c:145:20:unsigned long long get_ticks(void) get_ticks() returns 32-bit number no idea, too complicated ** u-boot/arch/arm/cpu/arm926ejs/mb86r0x/timer.c:65:20:unsigned long long get_ticks(void) get_ticks() returns 32-bit number __udelay doesn't handle roll-over ** u-boot/arch/arm/cpu/arm926ejs/lpc32xx/timer.c:74:20:unsigned long long get_ticks(void) get_ticks() returns 32-bit number __udelay is safe (doesn't handle roll-over - doesn't need to) ** u-boot/arch/arm/cpu/arm926ejs/mx27/timer.c:111:20:unsigned long long get_ticks(void) get_ticks() returns 32-bit number __udelay broken ** u-boot/arch/arm/cpu/arm926ejs/mxs/timer.c:81:20:unsigned long long get_ticks(void) get_ticks() returns 32-bit number __udelay complicated ** u-boot/arch/arm/cpu/arm926ejs/nomadik/timer.c:63:20:unsigned long long get_ticks(void) get_ticks() isn't a 32-bit number __udelay complicated ** u-boot/arch/arm/cpu/arm926ejs/omap/timer.c:140:20:unsigned long long get_ticks(void) get_ticks() isn't a 32-bit number __udelay looks good ** u-boot/arch/arm/cpu/arm926ejs/orion5x/timer.c:159:20:unsigned long long get_ticks(void) get_ticks() returns 32-bit number __udelay complicated ** u-boot/arch/arm/cpu/arm926ejs/pantheon/timer.c:189:20:unsigned long long get_ticks(void) get_ticks() doesn't return a 32-bit number __udelay doesn't handle roll-over ** u-boot/arch/arm/cpu/arm926ejs/spear/timer.c:111:20:unsigned long long get_ticks(void) get_ticks() doesn't return a 32-bit number __udelay looks good ** u-boot/arch/arm/cpu/armv7/arch_timer.c:24:20:unsigned long long get_ticks(void) get_ticks() returns 64-bit number __udelay doesn't handle 64-bit roll-over ** u-boot/arch/arm/cpu/armv7/at91/timer.c:78:20:unsigned long long get_ticks(void) get_ticks() returns 64-bit number __udelay looks good looks perfect ** u-boot/arch/arm/cpu/armv7/omap-common/timer.c:96:20:unsigned long long get_ticks(void) get_ticks() returns 32-bit number __udelay complicated but looks good ** u-boot/arch/arm/cpu/armv7/rmobile/timer.c:77:20:unsigned long long get_ticks(void) get_ticks() returns a 64-bit number __udelay looks good ** u-boot/arch/arm/cpu/armv7/s5p-common/timer.c:120:20:unsigned long long get_ticks(void) get_ticks() doesn't return a 32-bit number __udelay looks good ** u-boot/arch/arm/cpu/armv7/sunxi/timer.c:101:20:unsigned long long get_ticks(void) get_ticks() returns 32-bit number __udelay off by 1 on roll-over ** u-boot/arch/arm/cpu/armv7/vf610/timer.c:49:20:unsigned long long get_ticks(void) get_ticks() returns 64-bit number __udelay looks good ** u-boot/arch/arm/cpu/armv7/u8500/timer.c:123:20:unsigned long long get_ticks(void) get_ticks() returns 32-bit number __udelay off by 1 on rollover ** u-boot/arch/arm/cpu/armv7/zynq/timer.c:154:20:unsigned long long get_ticks(void) get_ticks() returns 32-bit number __udelay complicated ** u-boot/arch/arm/cpu/pxa/timer.c:45:20:unsigned long long get_ticks(void) get_ticks() returns a 32-bit number __udelay depends on 64-bit - HANGS ** u-boot/arch/arm/cpu/sa1100/timer.c:58:20:unsigned long long get_ticks(void) get_ticks() returns a 32-bit number __udelay looks good ** u-boot/arch/arm/imx-common/timer.c:74:20:unsigned long long get_ticks(void) get_ticks() returns 64-bit number __udelay doesn't handle 64-bit roll-over ** u-boot/arch/avr32/cpu/interrupts.c:36:20:unsigned long long get_ticks(void) get_ticks() returns 64-bit number __udelay() correctly handles overflow ** u-boot/arch/blackfin/cpu/interrupts.c:39:20:unsigned long long get_ticks(void) get_ticks() returns a 32-bit number __udelay() looks ok i think (pretty complicated) ** u-boot/arch/m68k/lib/time.c:179:20:unsigned long long get_ticks(void) get_ticks() returns a 32-bit number __udelay() looks ok ** u-boot/arch/microblaze/cpu/timer.c:80:20:unsigned long long get_ticks(void) get_ticks() returns a 32-bit number __udelay() looks ok. ** u-boot/arch/mips/cpu/mips32/time.c:58:20:unsigned long long get_ticks(void) get_ticks() returns a 32-bit number __udelay() complicated ** u-boot/arch/mips/cpu/mips64/time.c:58:20:unsigned long long get_ticks(void) get_ticks() might return 64-bit __udelay() complicated ** u-boot/arch/nds32/cpu/n1213/ag101/timer.c:173:20:unsigned long long get_ticks(void) get_ticks() returns 32-bit number __udelay() off-by-1 on roll-over ** u-boot/arch/nds32/cpu/n1213/ag102/timer.c:173:20:unsigned long long get_ticks(void) see above - same code Andrew Ruder (3): arm: pxa: use common timer functions arm: mx31: use common timer functions arm: mx35: use common timer functions arch/arm/cpu/arm1136/mx31/timer.c | 104 +----------------------------- arch/arm/cpu/arm1136/mx35/timer.c | 83 ------------------------ arch/arm/cpu/pxa/timer.c | 69 +------------------- arch/arm/include/asm/arch-mx31/imx-regs.h | 10 +++ arch/arm/include/asm/arch-mx35/imx-regs.h | 12 ++++ include/configs/pxa-common.h | 13 ++++ 6 files changed, 38 insertions(+), 253 deletions(-) Cc: Marek Vasut <marex(a)denx.de> -- 2.0.1

5 8

[U-Boot] [PATCH 1/5] edid: add function to convert edid to fb_videomode
by Christian Gmeiner 15 Sep '14

15 Sep '14

There may be some custom boards in the field which have an seperate eeprom chip to store edid informations in it. To make use of those edid information in the board code this patch add a function to convert edid to fb_videomode. Signed-off-by: Christian Gmeiner <christian.gmeiner(a)gmail.com> --- common/edid.c | 29 +++++++++++++++++++++++++++++ include/edid.h | 3 +++ 2 files changed, 32 insertions(+) diff --git a/common/edid.c b/common/edid.c index e66108f..8841c25 100644 --- a/common/edid.c +++ b/common/edid.c @@ -12,6 +12,7 @@ #include <common.h> #include <edid.h> +#include <linux/fb.h> #include <linux/ctype.h> #include <linux/string.h> @@ -288,3 +289,31 @@ void edid_print_info(struct edid1_info *edid_info) if (!have_timing) printf("\tNone\n"); } + +void edid_to_fb_videomode(struct edid1_info *edid, struct fb_videomode *mode) +{ + struct edid_monitor_descriptor *monitor = &edid->monitor_details.descriptor[0]; + unsigned char *bytes = (unsigned char *)monitor; + struct edid_detailed_timing *timing = (struct edid_detailed_timing *)monitor; + + uint32_t pixclock = EDID_DETAILED_TIMING_PIXEL_CLOCK(*timing); + uint32_t h_blanking = EDID_DETAILED_TIMING_HORIZONTAL_BLANKING(*timing); + uint32_t h_active = EDID_DETAILED_TIMING_HORIZONTAL_ACTIVE(*timing); + uint32_t h_sync_offset = EDID_DETAILED_TIMING_HSYNC_OFFSET(*timing); + uint32_t h_sync_width = EDID_DETAILED_TIMING_HSYNC_PULSE_WIDTH(*timing); + uint32_t v_blanking = EDID_DETAILED_TIMING_VERTICAL_BLANKING(*timing); + uint32_t v_active = EDID_DETAILED_TIMING_VERTICAL_ACTIVE(*timing); + uint32_t v_sync_offset = EDID_DETAILED_TIMING_VSYNC_OFFSET(*timing); + uint32_t v_sync_width = EDID_DETAILED_TIMING_VSYNC_PULSE_WIDTH(*timing); + + mode->name = "EDID"; + mode->pixclock = pixclock; + mode->yres = v_active; + mode->xres = h_active; + mode->left_margin = h_blanking - h_sync_offset - h_sync_width; + mode->right_margin = h_sync_offset; + mode->upper_margin = v_blanking - v_sync_offset - v_sync_width; + mode->lower_margin = v_sync_offset; + mode->hsync_len = h_sync_width; + mode->vsync_len = v_sync_width; +} diff --git a/include/edid.h b/include/edid.h index 480a773..4423062 100644 --- a/include/edid.h +++ b/include/edid.h @@ -233,6 +233,9 @@ struct edid1_info { */ void edid_print_info(struct edid1_info *edid_info); +struct fb_videomode; +void edid_to_fb_videomode(struct edid1_info *edid, struct fb_videomode *mode); + /** * Check the EDID info. * -- 1.7.10.4

6 30

[U-Boot] Mainline u-boot SPL for socfpga
by Charles Manning 15 Sep '14

15 Sep '14

Hello I am trying to understand the state of the socfpga preloader in mainline u-boot. >From what I see, this is broken and perhaps has never worked. When I build the code in u-boot-socfpga I get a healthy working u-boot-spl.bin of approx 45kbytes. When I build the mainline u-boot code I get a broken u-boot-spl.bin of approx 3kbytes. It seems the mainline u-boot is missing stuff, including the all-critical sdram initialisation without which the SPL is useless. So, I have a few related questions: 1. The SDRAM init code, like other SocFPGA "hand-off" files is generated by the Altera tools. Since it is not hand written, and is not compliant with u-boot coding style. Is it more important to preserve coding style and have a broken SPL than it is to have a working SPL and broken code? 2. Is there a practical "half-way" compromise whereby the generated code is run through lindent and we just accept that this is as good as it gets? 3. Can we get some sort of coding style waiver, considering that this code is off in a board file and does not impact on anyone working on anything other than socfpga (indeed nobody even working on socfpga even reads it). Clearly significant hand editing generated code makes for a very broken workflow, but running it through an automated step like lindent is Ok from a workflow point of view. Unless this can be resolved we end up with a situation where people working on SocFPGA are forced to fork for practical reasons. Regards Charles

5 28

[U-Boot] [PATCH 0/25] Introduce driver model support for SPI, SPI flash, cros_ec
by Simon Glass 15 Sep '14

15 Sep '14

Up until now driver model has not been used for any type of bus. Buses have some unique properties and needs, so we cannot claim that driver model can cover all the common cases unless we have converted a bus over to driver model. SPI is a reasonable choice for this next step. It has a fairly simple API and not too many dependencies. The main one is SPI flash so we may as well convert that also. Since the boards I test with have cros_ec I have also included that, for SPI only. The technique used is make use of driver model's supported data structures to hold information currently kept by each subsystem in a private data structure. Since 'struct spi_slave' relates to the slave device on the bus it is stored in the 'parent' data with each child device of the bus. Since 'struct spi_flash' is a standard interface used for each SPI flash driver, it is stored in the SPI FLash uclass's private data for each device. New defines are created to enable driver model for each subsystem. These are: CONFIG_DM_SPI CONFIG_DM_SPI_FLASH CONFIG_DM_CROS_EC This allows us to move some boards and drivers to driver model, while leaving others behind. A 'big bang' conversion of everything to driver model, event at a subsystem level, is never going to work. On the other hand, we change the driver at the same time as the CONFIG option is enabled. Keeping both version of the driver around involves a flock of #ifdefs, the benefit of which is not apparent to me, since the old code is removed anyway. There is some cost in changing the uclass interface after it is created, so if you have limited time, please spend it reviewing the uclass interfaces in spi.h and spi_flash.h. These need to be supported by each driver, so changing them later may involve changing multiple drivers. To help with conversion of SPI drivers to driver model, documentation is provided which takes the happy camper through the process with an example. As always, driver model patches are available at u-boot-dm.git branch 'working'. Note: This series is not fully ready - e.g. some header files are missing comments. But I wanted to get it out for review early since some SPI work is ongoing which might depend on it. Simon Glass (25): sandbox: Convert SPI flash emulation to use sf_params sandbox: config: Enable all SPI flash chips sandbox: dts: Add a SPI device and cros_ec device dm: spi: Move cmd device code into its own function spi: Add brackets and tidy defines in spi.h dm: spi: Add a uclass for SPI dm: sandbox: Add a SPI emulation uclass dm: Remove spi_init() from board_r.c when using driver model dm: Add spi.h header to a few files dm: spi: Adjust cmd_spi to work with driver model dm: sandbox: spi: Move to driver model dm: spi: Add documentation on how to convert over SPI drivers dm: exynos: Convert SPI to driver model sf: Add an empty entry to the parameter list sf: Tidy up public and private header files spi: Use error return value in sf_ops dm: sf: Add a uclass for SPI flash dm: Convert spi_flash_probe() and 'sf probe' to use driver model dm: sf: sandbox: Convert SPI flash driver to driver model dm: exynos: config: Use driver model for SPI flash dm: spi: Add tests dm: sf: Add tests for SPI flash dm: cros_ec: Add support for driver model dm: sandbox: cros_ec: Move sandbox cros_ec to driver module dm: exynos: cros_ec: Move cros_ec_spi to driver model arch/arm/dts/exynos5250-snow.dts | 8 + arch/arm/dts/exynos5420-peach-pit.dts | 1 + arch/sandbox/dts/sandbox.dts | 25 ++ arch/sandbox/include/asm/spi.h | 13 - arch/sandbox/include/asm/state.h | 2 +- board/buffalo/lsxl/lsxl.c | 3 +- board/samsung/common/board.c | 3 - common/board_r.c | 2 +- common/cmd_sf.c | 24 ++ common/cmd_spi.c | 73 +++- common/cros_ec.c | 30 ++ common/env_sf.c | 1 + common/exports.c | 4 +- doc/device-tree-bindings/mtd/spi/m25p80.txt | 29 ++ doc/driver-model/spi-howto.txt | 570 ++++++++++++++++++++++++++++ drivers/misc/cros_ec.c | 122 +++++- drivers/misc/cros_ec_sandbox.c | 99 ++++- drivers/misc/cros_ec_spi.c | 68 +++- drivers/mtd/spi/Makefile | 7 +- drivers/mtd/spi/ramtron.c | 1 + drivers/mtd/spi/sandbox.c | 438 +++++++++++++++------ drivers/mtd/spi/sf-uclass.c | 63 +++ drivers/mtd/spi/sf_internal.h | 67 +++- drivers/mtd/spi/sf_params.c | 2 + drivers/mtd/spi/sf_probe.c | 153 ++++++-- drivers/mtd/spi/spi_spl_load.c | 1 + drivers/spi/Makefile | 5 + drivers/spi/exynos_spi.c | 509 +++++++++---------------- drivers/spi/sandbox_spi.c | 198 ++++------ drivers/spi/spi-emul-uclass.c | 15 + drivers/spi/spi-uclass.c | 253 ++++++++++++ include/configs/exynos5-dt.h | 2 + include/configs/sandbox.h | 13 +- include/configs/smdk5420.h | 1 + include/cros_ec.h | 27 +- include/dm/uclass-id.h | 4 + include/spi.h | 194 +++++++++- include/spi_flash.h | 127 ++++--- test/dm/Makefile | 2 + test/dm/sf.c | 43 +++ test/dm/spi.c | 47 +++ test/dm/test.dts | 17 +- 42 files changed, 2504 insertions(+), 762 deletions(-) create mode 100644 doc/device-tree-bindings/mtd/spi/m25p80.txt create mode 100644 doc/driver-model/spi-howto.txt create mode 100644 drivers/mtd/spi/sf-uclass.c create mode 100644 drivers/spi/spi-emul-uclass.c create mode 100644 drivers/spi/spi-uclass.c create mode 100644 test/dm/sf.c create mode 100644 test/dm/spi.c -- 2.0.0.526.g5318336

4 50