October 2010 - U-Boot

[U-Boot] MX51 LCD Support
by Stefano Babic 22 Oct '10

22 Oct '10

This patchset adds support for LCD to the MX51 Soc using the IPUv3 graphic processor. This is a porting to U-Boot of the Linux driver developed and delivered by Freescale.

5 31

[U-Boot] [PATCH] env_sf - Do not free flash environment on successful read
by Oliver Dillinger 22 Oct '10

22 Oct '10

In env_relocate_spec(), env_flash is freed and set to NULL if CONFIG_ENV_OFFSET_REDUND is undefined. This leads to an "Environment SPI flash not initialized" error when performing a saveenv. br, Oliver diff --git a/common/env_sf.c b/common/env_sf.c index fb0c39b..fc5f9f3 100644 --- a/common/env_sf.c +++ b/common/env_sf.c @@ -384,7 +384,10 @@ void env_relocate_spec(void) ret = env_import(buf, 1); if (ret) + { gd->env_valid = 1; + return; + } out: spi_flash_free(env_flash); env_flash = NULL;

3 3

[U-Boot] [Patch v3] Add support for HP Jornada flashrom boards
by Kristoffer Ericson 22 Oct '10

22 Oct '10

This patch adds support for the HP Jornada flashboards that were made in 2008. Older flashroms should work if memory registers are adjusted. Signed-off-by: Kristoffer Ericson <kristoffer.ericson(a)gmail.com> --- Changes for v2: - Adding myself to MAINTAINERS - Fixing line lengths - Fixing comment style Changes for v3: - setting MACH_TYPE_JORNADA720 - CONFIG_SYS_HZ = 1000 MAINTAINERS | 4 + board/jornada/Makefile | 53 +++++++++++ board/jornada/config.mk | 6 ++ board/jornada/jornada.c | 65 ++++++++++++++ board/jornada/setup.S | 210 +++++++++++++++++++++++++++++++++++++++++++++ board/jornada/u-boot.lds | 58 +++++++++++++ boards.cfg | 1 + include/configs/jornada.h | 153 +++++++++++++++++++++++++++++++++ 8 files changed, 550 insertions(+), 0 deletions(-) create mode 100644 board/jornada/Makefile create mode 100644 board/jornada/config.mk create mode 100644 board/jornada/jornada.c create mode 100644 board/jornada/setup.S create mode 100644 board/jornada/u-boot.lds create mode 100644 include/configs/jornada.h diff --git a/MAINTAINERS b/MAINTAINERS index aabd871..3eecf79 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -593,6 +593,10 @@ Thomas Elste <info(a)elste.org> modnet50 ARM720T (NET+50) +Kristoffer Ericson <kristoffer.ericson(a)gmail.com> + + jornada SA1110 + Fabio Estevam <Fabio.Estevam(a)freescale.com> mx31pdk i.MX31 diff --git a/board/jornada/Makefile b/board/jornada/Makefile new file mode 100644 index 0000000..1b4e192 --- /dev/null +++ b/board/jornada/Makefile @@ -0,0 +1,53 @@ +# +# (C) Copyright 2000-2006 +# Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. +# +# 2004 (c) MontaVista Software, Inc. +# +# See file CREDITS for list of people who contributed to this +# project. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, +# MA 02111-1307 USA +# + +include $(TOPDIR)/config.mk + +LIB = $(obj)lib$(BOARD).a + +COBJS := jornada.o +SOBJS := setup.o + +SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) +SOBJS := $(addprefix $(obj),$(SOBJS)) + +$(LIB): $(obj).depend $(OBJS) $(SOBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) + +clean: + rm -f $(SOBJS) $(OBJS) + +distclean: clean + rm -f $(LIB) core *.bak $(obj).depend + +######################################################################### + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +######################################################################### diff --git a/board/jornada/config.mk b/board/jornada/config.mk new file mode 100644 index 0000000..59968aa --- /dev/null +++ b/board/jornada/config.mk @@ -0,0 +1,6 @@ +# +# SA-1110 based HP Jornada Flashrom +# +# We got 2 x 16 Intel SDRAM in total 128MB +# +TEXT_BASE = 0xc1f00000 diff --git a/board/jornada/jornada.c b/board/jornada/jornada.c new file mode 100644 index 0000000..79d64a4 --- /dev/null +++ b/board/jornada/jornada.c @@ -0,0 +1,65 @@ +/* + * (C) Copyright 2002 + * Sysgo Real-Time Solutions, GmbH <www.elinos.com> + * Marius Groeger <mgroeger(a)sysgo.de> + * + * 2004 (c) MontaVista Software, Inc. + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#include <common.h> +#include <SA-1100.h> + +DECLARE_GLOBAL_DATA_PTR; + +/* ------------------------------------------------------------------------- */ + +static void jornada_init(void) +{ + +} + +int board_init(void) +{ + gd->bd->bi_arch_number = MACH_TYPE_JORNADA720; + gd->bd->bi_boot_params = 0xc0000100; + + + /* + * Turn on flashing. + * Would be nice to have some protection but + * that would have to be implemented in the + * flash init function, which isnt possible yet. + */ + PPSR |= (1 << 7); + PPDR |= (1 << 7); + + return 0; +} + +int dram_init(void) +{ + gd->bd->bi_dram[0].start = PHYS_SDRAM_1; + gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE; + gd->bd->bi_dram[1].start = PHYS_SDRAM_2; + gd->bd->bi_dram[1].size = PHYS_SDRAM_2_SIZE; + + return (0); +} diff --git a/board/jornada/setup.S b/board/jornada/setup.S new file mode 100644 index 0000000..885e02f --- /dev/null +++ b/board/jornada/setup.S @@ -0,0 +1,210 @@ +/* + * Memory Setup stuff - taken from blob memsetup.S + * + * Copyright (C) 1999 2000 2001 Erik Mouw (J.A.K.Mouw(a)its.tudelft.nl) and + * Jan-Derk Bakker (J.D.Bakker(a)its.tudelft.nl) + * 2004 (c) MontaVista Software, Inc. + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + + +#include "config.h" +#include "version.h" + + +/*----------------------------------------------------------------------- + * Board defines: + */ + +#define MDCNFG 0x00 +#define MDCAS00 0x04 +#define MDCAS01 0x08 +#define MDCAS02 0x0C +#define MSC0 0x10 +#define MSC1 0x14 +#define MECR 0x18 +#define MDREFR 0x1C +#define MDCAS20 0x20 +#define MDCAS21 0x24 +#define MDCAS22 0x28 +#define MSC2 0x2C +#define SMCNFG 0x30 + +#define GPDR 0x04 +#define GPSR 0x08 +#define GPCR 0x0C +#define GAFR 0x1C + +#define PPDR 0x00 +#define PPSR 0x04 +#define PPAR 0x08 + +#define MDREFR_TRASR(n_) (n_ & (0x0000000f)) +#define MDREFR_DRI(n_) ((n_ & (0x00000fff)) << 4) +#define MDREFR_K0DB2 (1 << 18) +#define MDREFR_K1DB2 (1 << 22) +#define MDREFR_K2DB2 (1 << 26) + +#define MDREFR_K0RUN (1 << 17) +#define MDREFR_K1RUN (1 << 21) +#define MDREFR_K2RUN (1 << 25) + +#define MDREFR_SLFRSH (1 << 31) +#define MDREFR_E1PIN (1 << 20) + +#define PSSR 0x04 +#define PSSR_DH 0x00000008 +#define POSR 0x08 +#define RCSR 0x04 + +/*----------------------------------------------------------------------- + * Setup parameters for the board: + */ +MEM_BASE: .long 0xa0000000 +MEM_START: .long 0xc0000000 +PWR_BASE: .word 0x90020000 +RST_BASE: .long 0x90030000 +PPC_BASE: .long 0x90060000 +GPIO_BASE: .long 0x90040000 +IC_BASE: .word 0x90050000 + +cpuspeed: .word 0xa0 +/* calculated from old blob bootloader */ +mdcnfg: .long 0x00037267 /* mdcnfg 0x00037267 */ +mdcas00: .long 0x5555557f /* mdcas00 0x5555557f */ +mdcas01: .long 0x55555555 /* mdcas01 0x55555555 */ +mdcas02: .long 0x55555555 /* mdcas02 0x55555555 */ +msc0: .long 0xfff04f78 /* msc0 0xfff04f78 */ +msc1: .long 0xfff8fff0 /* msc1 0xfff8fff0 */ +mecr: .long 0x98c698c6 /* mecr 0x98c698c6 */ +mdrefr: .long 0x067600c7 /* mdrefr 0x04340327 */ +mdcas20: .long 0xd1284142 /* mdcas20 0xd1284142 */ +mdcas21: .long 0x72249529 /* mdcas21 0x72249529 */ +mdcas22: .long 0x78414351 /* mdcas22 0x78414351 */ +msc2: .long 0x201d2959 /* msc2 0x201d2959 */ +smcnfg: .long 0x00000000 /* smcnfg 0x00000000 */ + +pin_set_out: .long 0x37ff70 +pin_set_dir: .long 0x11480 + +gpdr_set: .long 0x0B3A0900 +gpsr_set: .long 0x02100800 +gpcr_set: .long 0x092A0100 +gafr_set: .long 0x08600000 + +.globl lowlevel_init +lowlevel_init: + + /* set output and direction of pins */ + ldr r0, PPC_BASE + ldr r1, pin_set_out + str r1, [r0, #PPSR] + ldr r1, pin_set_dir + str r1, [r0, #PPDR] + + /* Setting up the memory and stuff */ + /***********************************/ + + ldr r0, MEM_BASE + + ldr r1, mdcnfg + str r1, [r0, #MDCNFG] + ldr r1, mdcas00 + str r1, [r0, #MDCAS00] + ldr r1, mdcas01 + str r1, [r0, #MDCAS01] + ldr r1, mdcas02 + str r1, [r0, #MDCAS02] + ldr r1, mdcas20 + str r1, [r0, #MDCAS20] + ldr r1, mdcas21 + str r1, [r0, #MDCAS21] + ldr r1, mdcas22 + str r1, [r0, #MDCAS22] + + /* clear kxDB2 */ + ldr r2, [r0, #MDREFR] + bic r2, r2, #MDREFR_K0DB2 + bic r2, r2, #MDREFR_K1DB2 + bic r2, r2, #MDREFR_K2DB2 + str r2, [r0, #MDREFR] + + ldr r2, [r0, #MDREFR] + orr r2, r2, #MDREFR_TRASR(7) + + mov r4, #0x2000 + spin: subs r4, r4, #1 + bne spin + + ldr r1, PWR_BASE + mov r2, #PSSR_DH + str r2, [r1, #PSSR] + + ldr r2, [r0, #MDREFR] + bic r2, r2, #MDREFR_K0DB2 + bic r2, r2, #MDREFR_K1DB2 + bic r2, r2, #MDREFR_K2DB2 + str r2, [r0, #MDREFR] + + ldr r2, [r0, #MDREFR] + orr r2, r2, #MDREFR_TRASR(7) + orr r2, r2, #MDREFR_DRI(12) + orr r2, r2, #MDREFR_K0DB2 + orr r2, r2, #MDREFR_K1DB2 + orr r2, r2, #MDREFR_K2DB2 + str r2, [r0, #MDREFR] + + ldr r2, [r0, #MDREFR] + orr r2, r2, #MDREFR_K0RUN + orr r2, r2, #MDREFR_K1RUN + orr r2, r2, #MDREFR_K2RUN + str r2, [r0, #MDREFR] + + ldr r2, [r0, #MDREFR] + bic r2, r2, #MDREFR_SLFRSH + str r2, [r0, #MDREFR] + + ldr r2, [r0, #MDREFR] + orr r2, r2, #MDREFR_E1PIN + str r2, [r0, #MDREFR] + + ldr r2, MEM_START +.rept 8 + ldr r3, [r2] +.endr + + ldr r1, msc0 + str r1, [r0, #MSC0] + ldr r1, msc1 + str r1, [r0, #MSC1] + ldr r1, msc2 + str r1, [r0, #MSC2] + ldr r1, smcnfg + str r1, [r0, #SMCNFG] + ldr r1, mdcnfg + str r1, [r0, #MDCNFG] + ldr r1, mecr + str r1, [r0, #MECR] + + /* enable SDRAM */ + orr r1, r1, #0x00000001 + str r1, [r0, #MDCNFG] + + mov pc, lr diff --git a/board/jornada/u-boot.lds b/board/jornada/u-boot.lds new file mode 100644 index 0000000..de6101e --- /dev/null +++ b/board/jornada/u-boot.lds @@ -0,0 +1,58 @@ +/* + * (C) Copyright 2000-2004 + * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. + * 2004 (c) MontaVista Software, Inc. + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") +OUTPUT_ARCH(arm) +ENTRY(_start) +SECTIONS +{ + . = 0x00000000; + + . = ALIGN(4); + .text : + { + cpu/sa1100/start.o (.text) + *(.text) + } + + . = ALIGN(4); + .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) } + + . = ALIGN(4); + .data : { *(.data) } + + . = ALIGN(4); + .got : { *(.got) } + + + . = .; + __u_boot_cmd_start = .; + .u_boot_cmd : { *(.u_boot_cmd) } + __u_boot_cmd_end = .; + + . = ALIGN(4); + __bss_start = .; + .bss (NOLOAD) : { *(.bss) . = ALIGN(4); } + _end = .; +} diff --git a/boards.cfg b/boards.cfg index 132d178..569f93a 100644 --- a/boards.cfg +++ b/boards.cfg @@ -71,6 +71,7 @@ dnp1110 arm sa1100 gcplus arm sa1100 lart arm sa1100 shannon arm sa1100 +jornada arm sa1100 mimc200 avr32 at32ap - mimc at32ap700x eNET i386 i386 - - sc520 idmr m68k mcf52x2 diff --git a/include/configs/jornada.h b/include/configs/jornada.h new file mode 100644 index 0000000..7491b28 --- /dev/null +++ b/include/configs/jornada.h @@ -0,0 +1,153 @@ +/* + * Copyright 2010 (C) + * Kristoffer Ericson <kristoffer.ericson(a)gmail.com> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#ifndef __CONFIG_H +#define __CONFIG_H + +/* + * High Level Configuration Options + * (easy to change) + */ +#define CONFIG_SA1110 1 /* This is an SA110 CPU */ +#define CONFIG_JORNADA700 1 /* on an HP Jornada 700 series */ +#define CONFIG_SYS_FLASH_PROTECTION 1 +#define CONFIG_SYS_ARM_WITHOUT_RELOC 1 + +/* we will never enable dcache, because we have to setup MMU first */ +#define CONFIG_SYS_NO_DCACHE +#undef CONFIG_USE_IRQ + +/* Console setting */ + +#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ +#define CONFIG_SETUP_MEMORY_TAGS 1 +#define CONFIG_INITRD_TAG 1 + +/* + * Size of malloc() pool + */ +#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) +#define CONFIG_SYS_GBL_DATA_SIZE 128 /* size for initial data */ + +/* + * select serial console configuration + */ +#define CONFIG_SA1100_SERIAL 1 +#define CONFIG_SERIAL3 1 /* we use serial 3 */ +#define CONFIG_BAUDRATE 19200 +#define CONFIG_LOADS_ECHO 1 + +/* + * Command line configuration. + */ +#include <config_cmd_default.h> +#define CONFIG_CMD_FLASH +#define CONFIG_CMD_JFFS2 +#undef CONFIG_CMD_NET +#undef CONFIG_CMD_NFS +#undef CONFIG_CMD_FPGA +#undef CONFIG_CMD_MISC +#undef CONFIG_CMD_SETGETDCR +#undef CONFIG_CMD_XIMG + +#define CONFIG_BOOTDELAY 5 +#define CONFIG_BOOTARGS "root=/dev/hda1 console=ttySA0,19200n8 console=tty1" +#define CONFIG_BOOTCOMMAND "run boot_kernel" +#define CONFIG_SYS_AUTOLOAD "n" /* No autoload */ +#define CONFIG_SYS_LOAD_ADDR 0xc0000000 + +/* + * Miscellaneous configurable options + */ +#define CONFIG_SYS_LONGHELP /* undef to save memory */ +#define CONFIG_SYS_PROMPT "HP Jornada# " +#define CONFIG_SYS_CBSIZE 256 /* console buffsize */ +#define CONFIG_SYS_PBSIZE (256+sizeof(CONFIG_SYS_PROMPT)+16) +#define CONFIG_SYS_MAXARGS 16 /* max number of command args */ +#define CONFIG_SYS_BARGSIZE 256 /* Boot Argument Buffer Size */ +#define CONFIG_SYS_MEMTEST_START 0xc0040000 /* memtest works on */ +#define CONFIG_SYS_MEMTEST_END 0xc2000000 /* 4..128 MB */ +#define CONFIG_SYS_HZ 1000 +#define CONFIG_SYS_CPUSPEED 0x0a /* core clock 206MHz */ +#define CONFIG_SYS_BAUDRATE_TABLE { 19200, 38400, 57600, 115200 } + +/*----------------------------------------------------------------------- + * Stack sizes + * + * The stack sizes are set up in start.S using the settings below + */ +#define CONFIG_STACKSIZE (128*1024) /* regular stack */ +#define CONFIG_SYS_FLASH_CFI 1 +#define CONFIG_FLASH_CFI_DRIVER 1 +#define CONFIG_FLASH_CFI_WIDTH FLASH_CFI_32BIT +#define CONFIG_SYS_FLASH_BASE 0x00000000 +#define CONFIG_SYS_FLASH_ERASE_TOUT (4096) +#define CONFIG_SYS_FLASH_WRITE_TOUT (4096) +#define CONFIG_SYS_FLASH_INCREMENT 0x02000000 +#define PHYS_FLASH_1 0x00000000 /* starts at 0x0 */ +#define PHYS_FLASH_SIZE 0x04000000 /* 64MB */ +#define PHYS_FLASH_SECT_SIZE 0x00040000 /* 256KB Sectors */ +#define CONFIG_SYS_MAX_FLASH_BANKS 1 +#define CONFIG_SYS_MAX_FLASH_SECT 260 +#define CONFIG_SYS_FLASH_BANKS_LIST { PHYS_FLASH_1 } +#define CONFIG_SYS_FLASH_EMPTY_INFO 1 +#define CONFIG_SYS_MONITOR_LEN 0x00040000 +#define CONFIG_SYS_MONITOR_BASE 0x00000000 +#define CONFIG_FLASH_SHOW_PROGRESS 1 + +/* Environment */ +#define CONFIG_ENV_IS_IN_FLASH 1 +#define CONFIG_ENV_ADDR 0x00040000 +#define CONFIG_ENV_OFFSET 0x00040000 +#define CONFIG_ENV_SIZE 0x00040000 +#define CONFIG_ENV_SECT_SIZE 0x00040000 +#define CONFIG_ENV_OVERWRITE 1 + +/* + Monitor - 0x00000000 - 0x00040000 (256kb) + Environment - 0x00040000 - 0x00080000 (256kb) + Kernel - 0x00080000 - 0x00380000 (3mb) + Rootfs - 0x00380000 - 0x........ (rest) +*/ + +#define CONFIG_NR_DRAM_BANKS 2 +#define CONFIG_SYS_SDRAM_BASE 0x00000000 +#define CONFIG_SYS_INTRAM_BASE INTERNAL_SRAM_BASE +#define CONFIG_SYS_INTRAM_SIZE INTERNAL_SRAM_SIZE +#define CONFIG_SYS_INIT_SP_ADDR 0x0 +#define PHYS_SDRAM_1 0xc0000000 /* SDRAM Bank #1 */ +#define PHYS_SDRAM_2 0xc4000000 /* SDRAM Bank #2 */ +#define PHYS_SDRAM_1_SIZE 0x04000000 /* 64 MB */ +#define PHYS_SDRAM_2_SIZE 0x04000000 /* 64 MB */ + +#define CONFIG_CMD_MTDPARTS +#define CONFIG_MTD_DEVICE +#define CONFIG_FLASH_CFI_MTD +#define MTDIDS_DEFAULT "nor0=jornada7xx-0" +#define MTDPARTS_DEFAULT "mtdparts=jornada7xx-0:256k(u-boot),256k(env),"\ + "3m(kernel),-(user);" + +#define CONFIG_EXTRA_ENV_SETTINGS \ + "flash_kernel=protect off all; " \ + "erase 00080000 0037ffff;cp.b c0000000 00080000 00300000;\0" \ + "flash_uboot=protect off all; " \ + "erase 00000000 0003ffff;cp.b c0000000 00000000 00040000;\0" \ + "boot_kernel=cp.b 00080000 c0000000 00300000;bootm;\0" +#endif /* __CONFIG_H */ -- 1.7.3.1

2 2

[U-Boot] [PATCH 1/2] Move and rename common headers from under board/davinci
by Sughosh Ganu 22 Oct '10

22 Oct '10

Move and rename common header files from under board/davinci to the standard include file path. Signed-off-by: Sughosh Ganu <urwithsughosh(a)gmail.com> --- This patch is needed for adding board support for the hawkboard which uses nand_spl based boot mechanism. board/davinci/common/misc.c | 2 +- board/davinci/common/misc.h | 54 ----------------------------- board/davinci/da8xxevm/common.c | 2 +- board/davinci/da8xxevm/common.h | 30 ---------------- board/davinci/da8xxevm/da830evm.c | 4 +- board/davinci/da8xxevm/da850evm.c | 4 +- board/davinci/dm355evm/dm355evm.c | 2 +- board/davinci/dm355leopard/dm355leopard.c | 2 +- board/davinci/dm365evm/dm365evm.c | 2 +- board/davinci/dvevm/dvevm.c | 2 +- board/davinci/schmoogie/schmoogie.c | 2 +- board/davinci/sffsdr/sffsdr.c | 2 +- board/davinci/sonata/sonata.c | 2 +- include/da8xx_common.h | 30 ++++++++++++++++ include/davinci_misc.h | 54 +++++++++++++++++++++++++++++ 15 files changed, 97 insertions(+), 97 deletions(-) delete mode 100644 board/davinci/common/misc.h delete mode 100644 board/davinci/da8xxevm/common.h create mode 100644 include/da8xx_common.h create mode 100644 include/davinci_misc.h diff --git a/board/davinci/common/misc.c b/board/davinci/common/misc.c index b60a46e..28750b1 100644 --- a/board/davinci/common/misc.c +++ b/board/davinci/common/misc.c @@ -29,7 +29,7 @@ #include <net.h> #include <asm/arch/hardware.h> #include <asm/io.h> -#include "misc.h" +#include <davinci_misc.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/board/davinci/common/misc.h b/board/davinci/common/misc.h deleted file mode 100644 index a6ac3b9..0000000 --- a/board/davinci/common/misc.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (C) 2008 Lyrtech <www.lyrtech.com> - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -#ifndef __MISC_H -#define __MISC_H - -/* pin muxer definitions */ -#define PIN_MUX_NUM_FIELDS 8 /* Per register */ -#define PIN_MUX_FIELD_SIZE 4 /* n in bits */ -#define PIN_MUX_FIELD_MASK ((1 << PIN_MUX_FIELD_SIZE) - 1) - -/* pin definition */ -struct pinmux_config { - dv_reg *mux; /* Address of mux register */ - unsigned char value; /* Value to set in field */ - unsigned char field; /* field number */ -}; - -/* pin table definition */ -struct pinmux_resource { - const struct pinmux_config *pins; - const int n_pins; -}; - -#define PINMUX_ITEM(item) { \ - .pins = item, \ - .n_pins = ARRAY_SIZE(item) \ - } - -int dvevm_read_mac_address(uint8_t *buf); -void davinci_sync_env_enetaddr(uint8_t *rom_enetaddr); -int davinci_configure_pin_mux(const struct pinmux_config *pins, int n_pins); -int davinci_configure_pin_mux_items(const struct pinmux_resource *item, - int n_items); - -#endif /* __MISC_H */ diff --git a/board/davinci/da8xxevm/common.c b/board/davinci/da8xxevm/common.c index 9cd5204..f2d0266 100644 --- a/board/davinci/da8xxevm/common.c +++ b/board/davinci/da8xxevm/common.c @@ -20,7 +20,7 @@ #include <asm/io.h> #include <asm/arch/hardware.h> -#include "common.h" +#include <da8xx_common.h> #ifndef CONFIG_USE_IRQ void irq_init(void) diff --git a/board/davinci/da8xxevm/common.h b/board/davinci/da8xxevm/common.h deleted file mode 100644 index 7ae63a6..0000000 --- a/board/davinci/da8xxevm/common.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.com/ - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -#ifndef __COMMON_H -#define __COMMON_H - -struct lpsc_resource { - const int lpsc_no; -}; - -void irq_init(void); -int da8xx_configure_lpsc_items(const struct lpsc_resource *item, - int n_items); - -#endif /* __COMMON_H */ diff --git a/board/davinci/da8xxevm/da830evm.c b/board/davinci/da8xxevm/da830evm.c index 8a9f988..16eb8d2 100644 --- a/board/davinci/da8xxevm/da830evm.c +++ b/board/davinci/da8xxevm/da830evm.c @@ -40,8 +40,8 @@ #include <asm/arch/emif_defs.h> #include <asm/arch/emac_defs.h> #include <asm/io.h> -#include "../common/misc.h" -#include "common.h" +#include <davinci_misc.h> +#include <da8xx_common.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/board/davinci/da8xxevm/da850evm.c b/board/davinci/da8xxevm/da850evm.c index c8c5e1b..efb2605 100644 --- a/board/davinci/da8xxevm/da850evm.c +++ b/board/davinci/da8xxevm/da850evm.c @@ -29,8 +29,8 @@ #include <asm/arch/emif_defs.h> #include <asm/arch/emac_defs.h> #include <asm/io.h> -#include "../common/misc.h" -#include "common.h" +#include <davinci_misc.h> +#include <da8xx_common.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/board/davinci/dm355evm/dm355evm.c b/board/davinci/dm355evm/dm355evm.c index 87f284c..62b7e4f 100644 --- a/board/davinci/dm355evm/dm355evm.c +++ b/board/davinci/dm355evm/dm355evm.c @@ -22,7 +22,7 @@ #include <asm/arch/hardware.h> #include <asm/arch/emif_defs.h> #include <asm/arch/nand_defs.h> -#include "../common/misc.h" +#include <davinci_misc.h> #include <net.h> #include <netdev.h> diff --git a/board/davinci/dm355leopard/dm355leopard.c b/board/davinci/dm355leopard/dm355leopard.c index e89786e..f3e2b90 100644 --- a/board/davinci/dm355leopard/dm355leopard.c +++ b/board/davinci/dm355leopard/dm355leopard.c @@ -22,7 +22,7 @@ #include <asm/arch/hardware.h> #include <asm/arch/gpio_defs.h> #include <asm/arch/nand_defs.h> -#include "../common/misc.h" +#include <davinci_misc.h> #include <net.h> #include <netdev.h> diff --git a/board/davinci/dm365evm/dm365evm.c b/board/davinci/dm365evm/dm365evm.c index 85dbe2a..48ed5ba 100644 --- a/board/davinci/dm365evm/dm365evm.c +++ b/board/davinci/dm365evm/dm365evm.c @@ -24,7 +24,7 @@ #include <asm/arch/nand_defs.h> #include <asm/arch/gpio_defs.h> #include <netdev.h> -#include "../common/misc.h" +#include <davinci_misc.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/board/davinci/dvevm/dvevm.c b/board/davinci/dvevm/dvevm.c index 073c21a..d254f33 100644 --- a/board/davinci/dvevm/dvevm.c +++ b/board/davinci/dvevm/dvevm.c @@ -27,7 +27,7 @@ #include <common.h> #include <i2c.h> #include <asm/arch/hardware.h> -#include "../common/misc.h" +#include <davinci_misc.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/board/davinci/schmoogie/schmoogie.c b/board/davinci/schmoogie/schmoogie.c index 80a0f9f..b09a4bd 100644 --- a/board/davinci/schmoogie/schmoogie.c +++ b/board/davinci/schmoogie/schmoogie.c @@ -27,7 +27,7 @@ #include <common.h> #include <i2c.h> #include <asm/arch/hardware.h> -#include "../common/misc.h" +#include <davinci_misc.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/board/davinci/sffsdr/sffsdr.c b/board/davinci/sffsdr/sffsdr.c index 657cf2b..60e5456 100644 --- a/board/davinci/sffsdr/sffsdr.c +++ b/board/davinci/sffsdr/sffsdr.c @@ -30,7 +30,7 @@ #include <common.h> #include <i2c.h> #include <asm/arch/hardware.h> -#include "../common/misc.h" +#include <davinci_misc.h> #define DAVINCI_A3CR (0x01E00014) /* EMIF-A CS3 config register. */ #define DAVINCI_A3CR_VAL (0x3FFFFFFD) /* EMIF-A CS3 value for FPGA. */ diff --git a/board/davinci/sonata/sonata.c b/board/davinci/sonata/sonata.c index 1dc42c4..d85ae5a 100644 --- a/board/davinci/sonata/sonata.c +++ b/board/davinci/sonata/sonata.c @@ -28,7 +28,7 @@ #include <nand.h> #include <asm/arch/nand_defs.h> #include <asm/arch/hardware.h> -#include "../common/misc.h" +#include <davinci_misc.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/include/da8xx_common.h b/include/da8xx_common.h new file mode 100644 index 0000000..7ae63a6 --- /dev/null +++ b/include/da8xx_common.h @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.com/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#ifndef __COMMON_H +#define __COMMON_H + +struct lpsc_resource { + const int lpsc_no; +}; + +void irq_init(void); +int da8xx_configure_lpsc_items(const struct lpsc_resource *item, + int n_items); + +#endif /* __COMMON_H */ diff --git a/include/davinci_misc.h b/include/davinci_misc.h new file mode 100644 index 0000000..a6ac3b9 --- /dev/null +++ b/include/davinci_misc.h @@ -0,0 +1,54 @@ +/* + * Copyright (C) 2008 Lyrtech <www.lyrtech.com> + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#ifndef __MISC_H +#define __MISC_H + +/* pin muxer definitions */ +#define PIN_MUX_NUM_FIELDS 8 /* Per register */ +#define PIN_MUX_FIELD_SIZE 4 /* n in bits */ +#define PIN_MUX_FIELD_MASK ((1 << PIN_MUX_FIELD_SIZE) - 1) + +/* pin definition */ +struct pinmux_config { + dv_reg *mux; /* Address of mux register */ + unsigned char value; /* Value to set in field */ + unsigned char field; /* field number */ +}; + +/* pin table definition */ +struct pinmux_resource { + const struct pinmux_config *pins; + const int n_pins; +}; + +#define PINMUX_ITEM(item) { \ + .pins = item, \ + .n_pins = ARRAY_SIZE(item) \ + } + +int dvevm_read_mac_address(uint8_t *buf); +void davinci_sync_env_enetaddr(uint8_t *rom_enetaddr); +int davinci_configure_pin_mux(const struct pinmux_config *pins, int n_pins); +int davinci_configure_pin_mux_items(const struct pinmux_resource *item, + int n_items); + +#endif /* __MISC_H */ -- 1.7.0.4

2 7

[U-Boot] [PATCH] corenet_ds: Update CONFIG_SYS_GBL_DATA_SIZE to deal with growth in gd_t
by Kumar Gala 22 Oct '10

22 Oct '10

The recent change the env code added an additional 32 bytes into gd_t and that causes to grow pass the previous CONFIG_SYS_GBL_DATA_SIZE size. Signed-off-by: Kumar Gala <galak(a)kernel.crashing.org> --- include/configs/corenet_ds.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index 85147d0..2733fb2 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -213,7 +213,7 @@ #endif #define CONFIG_SYS_INIT_RAM_END 0x00004000 /* End of used area in RAM */ -#define CONFIG_SYS_GBL_DATA_SIZE 128 /* num bytes initial data */ +#define CONFIG_SYS_GBL_DATA_SIZE 256 /* num bytes initial data */ #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET -- 1.7.2.3

2 4

[U-Boot] [PATCH] powerpc: always print the RAM relocated address when boot up
by Roy Zang 22 Oct '10

22 Oct '10

The RAM relocated address is useful when debugging or there is u-boot crash dump. So always print it instead of debug. Signed-off-by: Roy Zang <tie-fei.zang(a)freescale.com> Cc: Wood Scott-B07421 <B07421(a)freescale.com> --- arch/powerpc/lib/board.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/powerpc/lib/board.c b/arch/powerpc/lib/board.c index c0c7fd4..74a9856 100644 --- a/arch/powerpc/lib/board.c +++ b/arch/powerpc/lib/board.c @@ -639,7 +639,7 @@ void board_init_r (gd_t *id, ulong dest_addr) serial_initialize(); #endif - debug ("Now running in RAM - U-Boot at: %08lx\n", dest_addr); + printf("Now running in RAM - U-Boot at: %08lx\n", dest_addr); WATCHDOG_RESET (); -- 1.5.6.5

3 2

Re: [U-Boot] [PATCH V2 3/4] MX51: Add video support
by Liu Ying 22 Oct '10

22 Oct '10

Hello, Stefano, It looks that your framebuffer patch supports one framebuffer only on IPU DI0. Could you please consider to add the support for framebuffer on IPU DI1, as someone may design a board whose primary display device is connected with IPU DI1. And, it will be better if the following two points can be supported: 1) Two framebuffers on IPU DI0 and DI1 can be support at the same time, that is to say, users may see two pictures on two display devices respectively. 2) IPU DP module supports to combine two layers. The overlay layer can have a smaller resolution than the bottom layer. And, color space conversion, color key, global alpha and local alpha are supported by DP, too. I 'm not sure if these features are really needed in u-boot or not. Best Regards, Liu Ying > From: Stefano Babic <sbabic(a)denx.de> > Date: 2010/10/12 > To: u-boot(a)lists.denx.de > > > Add framebuffer driver for the MX51 processor > working on the IPUv3 internal graphic processor. > > Signed-off-by: Stefano Babic <sbabic(a)denx.de> > --- > drivers/video/Makefile | 1 + > drivers/video/mxc_ipuv3_fb.c | 661 ++++++++++++++++++++++++++++++++++++++++++ > drivers/video/mxcfb.h | 78 +++++ > 3 files changed, 740 insertions(+), 0 deletions(-) > create mode 100644 drivers/video/mxc_ipuv3_fb.c > create mode 100644 drivers/video/mxcfb.h > > diff --git a/drivers/video/Makefile b/drivers/video/Makefile > index 4be82e7..5b7b261 100644 > --- a/drivers/video/Makefile > +++ b/drivers/video/Makefile > @@ -34,6 +34,7 @@ COBJS-$(CONFIG_VIDEO_CT69000) += ct69000.o videomodes.o > COBJS-$(CONFIG_VIDEO_MB862xx) += mb862xx.o videomodes.o > COBJS-$(CONFIG_VIDEO_MB86R0xGDC) += mb86r0xgdc.o videomodes.o > COBJS-$(CONFIG_VIDEO_MX3) += mx3fb.o > +COBJS-$(CONFIG_VIDEO_MX5) += mxc_ipuv3_fb.o ipu_common.o ipu_disp.o > COBJS-$(CONFIG_VIDEO_SED13806) += sed13806.o > COBJS-$(CONFIG_SED156X) += sed156x.o > COBJS-$(CONFIG_VIDEO_SM501) += sm501.o > diff --git a/drivers/video/mxc_ipuv3_fb.c b/drivers/video/mxc_ipuv3_fb.c > new file mode 100644 > index 0000000..7a905c5 > --- /dev/null > +++ b/drivers/video/mxc_ipuv3_fb.c > @@ -0,0 +1,661 @@ > +/* > + * Porting to u-boot: > + * > + * (C) Copyright 2010 > + * Stefano Babic, DENX Software Engineering, sbabic(a)denx.de > + * > + * MX51 Linux framebuffer: > + * > + * (C) Copyright 2004-2010 Freescale Semiconductor, Inc. > + * > + * See file CREDITS for list of people who contributed to this > + * project. > + * > + * This program is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License as > + * published by the Free Software Foundation; either version 2 of > + * the License, or (at your option) any later version. > + * > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * You should have received a copy of the GNU General Public License > + * along with this program; if not, write to the Free Software > + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, > + * MA 02111-1307 USA > + */ > + > +/* #define DEBUG */ > +#include <common.h> > +#include <asm/errno.h> > +#include <linux/string.h> > +#include <linux/list.h> > +#include <linux/fb.h> > +#include <asm/io.h> > +#include <malloc.h> > +#include <lcd.h> > +#include "videomodes.h" > +#include "ipu.h" > +#include "mxcfb.h" > + > +DECLARE_GLOBAL_DATA_PTR; > + > +void *lcd_base; /* Start of framebuffer memory */ > +void *lcd_console_address; /* Start of console buffer */ > + > +int lcd_line_length; > +int lcd_color_fg; > +int lcd_color_bg; > + > +short console_col; > +short console_row; > + > +vidinfo_t panel_info; > + > +static int mxcfb_map_video_memory(struct fb_info *fbi); > +static int mxcfb_unmap_video_memory(struct fb_info *fbi); > + > +void lcd_initcolregs(void) > +{ > +} > + > +void lcd_setcolreg(ushort regno, ushort red, ushort green, ushort blue) > +{ > +} > + > +void lcd_disable(void) > +{ > +} > + > +void lcd_panel_disable(void) > +{ > +} > + > +void fb_videomode_to_var(struct fb_var_screeninfo *var, > + const struct fb_videomode *mode) > +{ > + var->xres = mode->xres; > + var->yres = mode->yres; > + var->xres_virtual = mode->xres; > + var->yres_virtual = mode->yres; > + var->xoffset = 0; > + var->yoffset = 0; > + var->pixclock = mode->pixclock; > + var->left_margin = mode->left_margin; > + var->right_margin = mode->right_margin; > + var->upper_margin = mode->upper_margin; > + var->lower_margin = mode->lower_margin; > + var->hsync_len = mode->hsync_len; > + var->vsync_len = mode->vsync_len; > + var->sync = mode->sync; > + var->vmode = mode->vmode & FB_VMODE_MASK; > +} > + > +/* > + * Structure containing the MXC specific framebuffer information. > + */ > +struct mxcfb_info { > + int blank; > + ipu_channel_t ipu_ch; > + int ipu_di; > + u32 ipu_di_pix_fmt; > + bool overlay; > + bool alpha_chan_en; > + dma_addr_t alpha_phy_addr0; > + dma_addr_t alpha_phy_addr1; > + void *alpha_virt_addr0; > + void *alpha_virt_addr1; > + uint32_t alpha_mem_len; > + uint32_t cur_ipu_buf; > + uint32_t cur_ipu_alpha_buf; > + > + u32 pseudo_palette[16]; > +}; > + > +enum { > + BOTH_ON, > + SRC_ON, > + TGT_ON, > + BOTH_OFF > +}; > + > +static unsigned long default_bpp = 16; > +static bool g_dp_in_use; > +static struct fb_info *mxcfb_info[3]; > +static int ext_clk_used; > + > +static uint32_t bpp_to_pixfmt(struct fb_info *fbi) > +{ > + uint32_t pixfmt = 0; > + > + debug("bpp_to_pixfmt: %d\n", fbi->var.bits_per_pixel); > + > + if (fbi->var.nonstd) > + return fbi->var.nonstd; > + > + switch (fbi->var.bits_per_pixel) { > + case 24: > + pixfmt = IPU_PIX_FMT_BGR24; > + break; > + case 32: > + pixfmt = IPU_PIX_FMT_BGR32; > + break; > + case 16: > + pixfmt = IPU_PIX_FMT_RGB565; > + break; > + } > + return pixfmt; > +} > + > +/* > + * Set fixed framebuffer parameters based on variable settings. > + * > + * @param info framebuffer information pointer > + */ > +static int mxcfb_set_fix(struct fb_info *info) > +{ > + struct fb_fix_screeninfo *fix = &info->fix; > + struct fb_var_screeninfo *var = &info->var; > + > + fix->line_length = var->xres_virtual * var->bits_per_pixel / 8; > + > + fix->type = FB_TYPE_PACKED_PIXELS; > + fix->accel = FB_ACCEL_NONE; > + fix->visual = FB_VISUAL_TRUECOLOR; > + fix->xpanstep = 1; > + fix->ypanstep = 1; > + > + return 0; > +} > + > +static int setup_disp_channel1(struct fb_info *fbi) > +{ > + ipu_channel_params_t params; > + struct mxcfb_info *mxc_fbi = (struct mxcfb_info *)fbi->par; > + > + memset(&params, 0, sizeof(params)); > + params.mem_dp_bg_sync.di = mxc_fbi->ipu_di; > + > + debug("%s called\n", __func__); > + /* > + * Assuming interlaced means yuv output, below setting also > + * valid for mem_dc_sync. FG should have the same vmode as BG. > + */ > + if (fbi->var.vmode & FB_VMODE_INTERLACED) { > + params.mem_dp_bg_sync.interlaced = true; > + params.mem_dp_bg_sync.out_pixel_fmt = > + IPU_PIX_FMT_YUV444; > + } else { > + if (mxc_fbi->ipu_di_pix_fmt) > + params.mem_dp_bg_sync.out_pixel_fmt = > + mxc_fbi->ipu_di_pix_fmt; > + else > + params.mem_dp_bg_sync.out_pixel_fmt = > + IPU_PIX_FMT_RGB666; > + } > + params.mem_dp_bg_sync.in_pixel_fmt = bpp_to_pixfmt(fbi); > + if (mxc_fbi->alpha_chan_en) > + params.mem_dp_bg_sync.alpha_chan_en = true; > + > + ipu_init_channel(mxc_fbi->ipu_ch, &params); > + > + return 0; > +} > + > +static int setup_disp_channel2(struct fb_info *fbi) > +{ > + int retval = 0; > + struct mxcfb_info *mxc_fbi = (struct mxcfb_info *)fbi->par; > + > + mxc_fbi->cur_ipu_buf = 1; > + if (mxc_fbi->alpha_chan_en) { > + mxc_fbi->cur_ipu_alpha_buf = 1; > + } > + fbi->var.xoffset = fbi->var.yoffset = 0; > + > + debug("%s: %x %d %d %d %lx %lx\n", > + __func__, > + mxc_fbi->ipu_ch, > + fbi->var.xres, > + fbi->var.yres, > + fbi->fix.line_length, > + fbi->fix.smem_start, > + fbi->fix.smem_start + > + (fbi->fix.line_length * fbi->var.yres)); > + > + retval = ipu_init_channel_buffer(mxc_fbi->ipu_ch, IPU_INPUT_BUFFER, > + bpp_to_pixfmt(fbi), > + fbi->var.xres, fbi->var.yres, > + fbi->fix.line_length, > + fbi->fix.smem_start + > + (fbi->fix.line_length * fbi->var.yres), > + fbi->fix.smem_start, > + 0, 0); > + if (retval) { > + printf("ipu_init_channel_buffer error %d\n", retval); > + } > + > + return retval; > +} > + > +/* > + * Set framebuffer parameters and change the operating mode. > + * > + * @param info framebuffer information pointer > + */ > +static int mxcfb_set_par(struct fb_info *fbi) > +{ > + int retval = 0; > + u32 mem_len; > + ipu_di_signal_cfg_t sig_cfg; > + struct mxcfb_info *mxc_fbi = (struct mxcfb_info *)fbi->par; > + uint32_t out_pixel_fmt; > + > + ipu_disable_channel(mxc_fbi->ipu_ch); > + ipu_uninit_channel(mxc_fbi->ipu_ch); > + mxcfb_set_fix(fbi); > + > + mem_len = fbi->var.yres_virtual * fbi->fix.line_length; > + if (!fbi->fix.smem_start || (mem_len > fbi->fix.smem_len)) { > + if (fbi->fix.smem_start) > + mxcfb_unmap_video_memory(fbi); > + > + if (mxcfb_map_video_memory(fbi) < 0) > + return -ENOMEM; > + } > + > + setup_disp_channel1(fbi); > + > + memset(&sig_cfg, 0, sizeof(sig_cfg)); > + if (fbi->var.vmode & FB_VMODE_INTERLACED) { > + sig_cfg.interlaced = true; > + out_pixel_fmt = IPU_PIX_FMT_YUV444; > + } else { > + if (mxc_fbi->ipu_di_pix_fmt) > + out_pixel_fmt = mxc_fbi->ipu_di_pix_fmt; > + else > + out_pixel_fmt = IPU_PIX_FMT_RGB666; > + } > + if (fbi->var.vmode & FB_VMODE_ODD_FLD_FIRST) /* PAL */ > + sig_cfg.odd_field_first = true; > + if ((fbi->var.sync & FB_SYNC_EXT) || ext_clk_used) > + sig_cfg.ext_clk = true; > + if (fbi->var.sync & FB_SYNC_HOR_HIGH_ACT) > + sig_cfg.Hsync_pol = true; > + if (fbi->var.sync & FB_SYNC_VERT_HIGH_ACT) > + sig_cfg.Vsync_pol = true; > + if (!(fbi->var.sync & FB_SYNC_CLK_LAT_FALL)) > + sig_cfg.clk_pol = true; > + if (fbi->var.sync & FB_SYNC_DATA_INVERT) > + sig_cfg.data_pol = true; > + if (!(fbi->var.sync & FB_SYNC_OE_LOW_ACT)) > + sig_cfg.enable_pol = true; > + if (fbi->var.sync & FB_SYNC_CLK_IDLE_EN) > + sig_cfg.clkidle_en = true; > + > + debug("pixclock = %ul Hz\n", > + (u32) (PICOS2KHZ(fbi->var.pixclock) * 1000UL)); > + > + if (ipu_init_sync_panel(mxc_fbi->ipu_di, > + (PICOS2KHZ(fbi->var.pixclock)) * 1000UL, > + fbi->var.xres, fbi->var.yres, > + out_pixel_fmt, > + fbi->var.left_margin, > + fbi->var.hsync_len, > + fbi->var.right_margin, > + fbi->var.upper_margin, > + fbi->var.vsync_len, > + fbi->var.lower_margin, > + 0, sig_cfg) != 0) { > + puts("mxcfb: Error initializing panel.\n"); > + return -EINVAL; > + } > + > + retval = setup_disp_channel2(fbi); > + if (retval) > + return retval; > + > + if (mxc_fbi->blank == FB_BLANK_UNBLANK) { > + ipu_enable_channel(mxc_fbi->ipu_ch); > + } > + > + return retval; > +} > + > +/* > + * Check framebuffer variable parameters and adjust to valid values. > + * > + * @param var framebuffer variable parameters > + * > + * @param info framebuffer information pointer > + */ > +static int mxcfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) > +{ > + u32 vtotal; > + u32 htotal; > + > + if (var->xres_virtual < var->xres) > + var->xres_virtual = var->xres; > + if (var->yres_virtual < var->yres) > + var->yres_virtual = var->yres; > + > + if ((var->bits_per_pixel != 32) && (var->bits_per_pixel != 24) && > + (var->bits_per_pixel != 16) && (var->bits_per_pixel != 8)) > + var->bits_per_pixel = default_bpp; > + > + switch (var->bits_per_pixel) { > + case 8: > + var->red.length = 3; > + var->red.offset = 5; > + var->red.msb_right = 0; > + > + var->green.length = 3; > + var->green.offset = 2; > + var->green.msb_right = 0; > + > + var->blue.length = 2; > + var->blue.offset = 0; > + var->blue.msb_right = 0; > + > + var->transp.length = 0; > + var->transp.offset = 0; > + var->transp.msb_right = 0; > + break; > + case 16: > + var->red.length = 5; > + var->red.offset = 11; > + var->red.msb_right = 0; > + > + var->green.length = 6; > + var->green.offset = 5; > + var->green.msb_right = 0; > + > + var->blue.length = 5; > + var->blue.offset = 0; > + var->blue.msb_right = 0; > + > + var->transp.length = 0; > + var->transp.offset = 0; > + var->transp.msb_right = 0; > + break; > + case 24: > + var->red.length = 8; > + var->red.offset = 16; > + var->red.msb_right = 0; > + > + var->green.length = 8; > + var->green.offset = 8; > + var->green.msb_right = 0; > + > + var->blue.length = 8; > + var->blue.offset = 0; > + var->blue.msb_right = 0; > + > + var->transp.length = 0; > + var->transp.offset = 0; > + var->transp.msb_right = 0; > + break; > + case 32: > + var->red.length = 8; > + var->red.offset = 16; > + var->red.msb_right = 0; > + > + var->green.length = 8; > + var->green.offset = 8; > + var->green.msb_right = 0; > + > + var->blue.length = 8; > + var->blue.offset = 0; > + var->blue.msb_right = 0; > + > + var->transp.length = 8; > + var->transp.offset = 24; > + var->transp.msb_right = 0; > + break; > + } > + > + if (var->pixclock < 1000) { > + htotal = var->xres + var->right_margin + var->hsync_len + > + var->left_margin; > + vtotal = var->yres + var->lower_margin + var->vsync_len + > + var->upper_margin; > + var->pixclock = (vtotal * htotal * 6UL) / 100UL; > + var->pixclock = KHZ2PICOS(var->pixclock); > + printf("pixclock set for 60Hz refresh = %u ps\n", > + var->pixclock); > + } > + > + var->height = -1; > + var->width = -1; > + var->grayscale = 0; > + > + return 0; > +} > + > +/* > + * Allocates the DRAM memory for the frame buffer. This buffer is remapped > + * into a non-cached, non-buffered, memory region to allow palette and pixel > + * writes to occur without flushing the cache. Once this area is remapped, > + * all virtual memory access to the video memory should occur at the new region. > + * > + * @param fbi framebuffer information pointer > + * > + * @return Error code indicating success or failure > + */ > +static int mxcfb_map_video_memory(struct fb_info *fbi) > +{ > + if (fbi->fix.smem_len < fbi->var.yres_virtual * fbi->fix.line_length) > + fbi->fix.smem_len = fbi->var.yres_virtual * > + fbi->fix.line_length; > + > + fbi->screen_base = (char *)lcd_base; > + fbi->fix.smem_start = (unsigned long)lcd_base; > + if (fbi->screen_base == 0) { > + puts("Unable to allocate framebuffer memory\n"); > + fbi->fix.smem_len = 0; > + fbi->fix.smem_start = 0; > + return -EBUSY; > + } > + > + debug("allocated fb @ paddr=0x%08X, size=%d.\n", > + (uint32_t) fbi->fix.smem_start, fbi->fix.smem_len); > + > + fbi->screen_size = fbi->fix.smem_len; > + > + /* Clear the screen */ > + memset((char *)fbi->screen_base, 0, fbi->fix.smem_len); > + > + return 0; > +} > + > +/* > + * De-allocates the DRAM memory for the frame buffer. > + * > + * @param fbi framebuffer information pointer > + * > + * @return Error code indicating success or failure > + */ > +static int mxcfb_unmap_video_memory(struct fb_info *fbi) > +{ > + fbi->screen_base = 0; > + fbi->fix.smem_start = 0; > + fbi->fix.smem_len = 0; > + return 0; > +} > + > +/* > + * Initializes the framebuffer information pointer. After allocating > + * sufficient memory for the framebuffer structure, the fields are > + * filled with custom information passed in from the configurable > + * structures. This includes information such as bits per pixel, > + * color maps, screen width/height and RGBA offsets. > + * > + * @return Framebuffer structure initialized with our information > + */ > +static struct fb_info *mxcfb_init_fbinfo(void) > +{ > +#define BYTES_PER_LONG 4 > +#define PADDING (BYTES_PER_LONG - (sizeof(struct fb_info) % BYTES_PER_LONG)) > + struct fb_info *fbi; > + struct mxcfb_info *mxcfbi; > + char *p; > + int size = sizeof(struct mxcfb_info) + PADDING + > + sizeof(struct fb_info); > + > + debug("%s: %d %d %d %d\n", > + __func__, > + PADDING, > + size, > + sizeof(struct mxcfb_info), > + sizeof(struct fb_info)); > + /* > + * Allocate sufficient memory for the fb structure > + */ > + > + p = malloc(size); > + if (!p) > + return NULL; > + > + memset(p, 0, size); > + > + fbi = (struct fb_info *)p; > + fbi->par = p + sizeof(struct fb_info) + PADDING; > + > + mxcfbi = (struct mxcfb_info *)fbi->par; > + debug("Framebuffer structures at: fbi=0x%x mxcfbi=0x%x\n", > + (unsigned int)fbi, (unsigned int)mxcfbi); > + > + fbi->var.activate = FB_ACTIVATE_NOW; > + > + fbi->flags = FBINFO_FLAG_DEFAULT; > + fbi->pseudo_palette = mxcfbi->pseudo_palette; > + > + return fbi; > +} > + > +/* > + * Probe routine for the framebuffer driver. It is called during the > + * driver binding process. The following functions are performed in > + * this routine: Framebuffer initialization, Memory allocation and > + * mapping, Framebuffer registration, IPU initialization. > + * > + * @return Appropriate error code to the kernel common code > + */ > +static int mxcfb_probe(u32 interface_pix_fmt, struct fb_videomode *mode) > +{ > + struct fb_info *fbi; > + struct mxcfb_info *mxcfbi; > + int ret = 0; > + > + /* > + * Initialize FB structures > + */ > + fbi = mxcfb_init_fbinfo(); > + if (!fbi) { > + ret = -ENOMEM; > + goto err0; > + } > + mxcfbi = (struct mxcfb_info *)fbi->par; > + > + if (!g_dp_in_use) { > + mxcfbi->ipu_ch = MEM_BG_SYNC; > + mxcfbi->blank = FB_BLANK_UNBLANK; > + } else { > + mxcfbi->ipu_ch = MEM_DC_SYNC; > + mxcfbi->blank = FB_BLANK_POWERDOWN; > + } > + > + mxcfbi->ipu_di = 0; > + > + ipu_disp_set_global_alpha(mxcfbi->ipu_ch, true, 0x80); > + ipu_disp_set_color_key(mxcfbi->ipu_ch, false, 0); > + strcpy(fbi->fix.id, "DISP3 BG"); > + > + g_dp_in_use = true; > + > + mxcfb_info[mxcfbi->ipu_di] = fbi; > + > + /* Need dummy values until real panel is configured */ > + fbi->var.xres = 640; > + fbi->var.yres = 480; > + fbi->var.bits_per_pixel = 16; > + > + mxcfbi->ipu_di_pix_fmt = interface_pix_fmt; > + fb_videomode_to_var(&fbi->var, mode); > + > + mxcfb_check_var(&fbi->var, fbi); > + > + /* Default Y virtual size is 2x panel size */ > + fbi->var.yres_virtual = fbi->var.yres * 2; > + > + mxcfb_set_fix(fbi); > + > + /* alocate fb first */ > + if (mxcfb_map_video_memory(fbi) < 0) > + return -ENOMEM; > + > + mxcfb_set_par(fbi); > + > + /* Setting panel_info for lcd */ > + panel_info.cmap = NULL; > + panel_info.vl_col = fbi->var.xres; > + panel_info.vl_row = fbi->var.yres; > + panel_info.vl_bpix = LCD_BPP; > + > + lcd_line_length = (panel_info.vl_col * NBITS(panel_info.vl_bpix)) / 8; > + > + debug("MXC IPUV3 configured\n" > + "XRES = %d YRES = %d BitsXpixel = %d\n", > + panel_info.vl_col, > + panel_info.vl_row, > + panel_info.vl_bpix); > + > + ipu_dump_registers(); > + > + return 0; > + > +err0: > + return ret; > +} > + > +int overwrite_console(void) > +{ > + /* Keep stdout / stderr on serial, our LCD is for splashscreen only */ > + return 1; > +} > + > +void lcd_ctrl_init(void *lcdbase) > +{ > + u32 mem_len = panel_info.vl_col * > + panel_info.vl_row * > + NBITS(panel_info.vl_bpix) / 8; > + > + /* > + * We rely on lcdbase being a physical address, i.e., either MMU off, > + * or 1-to-1 mapping. Might want to add some virt2phys here. > + */ > + if (!lcdbase) > + return; > + > + memset(lcdbase, 0, mem_len); > +} > + > +int mx51_fb_init(struct fb_videomode *mode) > +{ > + int ret; > + > + ret = ipu_probe(); > + if (ret) { > + puts("Error initializing IPU\n"); > + } > + > + > + lcd_base += 56; > + > + debug("Framebuffet at 0x%x\n", (unsigned int)lcd_base); > + ret = mxcfb_probe(IPU_PIX_FMT_RGB666, mode); > + > + return ret; > +} > diff --git a/drivers/video/mxcfb.h b/drivers/video/mxcfb.h > new file mode 100644 > index 0000000..e1c1d72 > --- /dev/null > +++ b/drivers/video/mxcfb.h > @@ -0,0 +1,78 @@ > +/* > + * Copyright 2004-2009 Freescale Semiconductor, Inc. All Rights Reserved. > + */ > + > +/* > + * The code contained herein is licensed under the GNU Lesser General > + * Public License. You may obtain a copy of the GNU Lesser General > + * Public License Version 2.1 or later at the following locations: > + * > + * http://www.opensource.org/licenses/lgpl-license.html > + * http://www.gnu.org/copyleft/lgpl.html > + */ > + > +/* > + * @file arch-mxc/ mxcfb.h > + * > + * @brief Global header file for the MXC Frame buffer > + * > + * @ingroup Framebuffer > + */ > +#ifndef __ASM_ARCH_MXCFB_H__ > +#define __ASM_ARCH_MXCFB_H__ > + > +#define FB_SYNC_OE_LOW_ACT 0x80000000 > +#define FB_SYNC_CLK_LAT_FALL 0x40000000 > +#define FB_SYNC_DATA_INVERT 0x20000000 > +#define FB_SYNC_CLK_IDLE_EN 0x10000000 > +#define FB_SYNC_SHARP_MODE 0x08000000 > +#define FB_SYNC_SWAP_RGB 0x04000000 > + > +struct mxcfb_gbl_alpha { > + int enable; > + int alpha; > +}; > + > +struct mxcfb_loc_alpha { > + int enable; > + int alpha_in_pixel; > + unsigned long alpha_phy_addr0; > + unsigned long alpha_phy_addr1; > +}; > + > +struct mxcfb_color_key { > + int enable; > + __u32 color_key; > +}; > + > +struct mxcfb_pos { > + __u16 x; > + __u16 y; > +}; > + > +struct mxcfb_gamma { > + int enable; > + int constk[16]; > + int slopek[16]; > +}; > + > +#ifdef __KERNEL__ > + > +extern struct fb_videomode mxcfb_modedb[]; > +extern int mxcfb_modedb_sz; > + > +enum { > + MXCFB_REFRESH_OFF, > + MXCFB_REFRESH_AUTO, > + MXCFB_REFRESH_PARTIAL, > +}; > + > +struct mxcfb_rect { > + u32 top; > + u32 left; > + u32 width; > + u32 height; > +}; > + > +#endif /* __KERNEL__ */ > +#endif > -- > 1.6.3.3 >

2 1

[U-Boot] marketing email list
by Aguilar Q Kellie 22 Oct '10

22 Oct '10

Package deals this week: 5 lists for $300 or 1 for $149 (Offer ends Friday) *Inquire about custom packages also available for other quantities* You can choose any list from the catalog below: [ HEALTHCARE ] > Complete US Physicians Database > Chiropractic Doctors in the USA > American Holistic Medicine Providers/Clinics > General Dentists in the USA > American Veterinarians & Veterinary Clinics > US Hospitals > Nursing Homes int the US > Pharmaceutical Company Employees > Physical/Occupational Therapy Clinics and Therapists in the US > Oncology Physicians in the US > US Surgery Centers > Massage Therapists/Therapy Clinics in America > Acupuncturists/clinics in the US > Medical Equipment Suppliers(USA) > Mental Health Counselors (USA) > Optometrists/Clinics (USA) > Psychologists (USA) [ BUSINESS LISTS ] > Hotels in the USA > Realtors in the USA > USA Business Database > Manufacturer Database (USA) > Financial Planner Database (USA) > Finance & Professionals Database (USA) [ CONSUMER LISTS ] > USA Consumer Database > Credit Inquiries Database (USA) > American Homeowners [ PROFESSIONALS LISTS ] > USA Lawyers Database > Criminal Attorneys in the US Email me for counts, breakdowns and sample spreadsheets: thinksuccess(a)gmx.com Send email to purgefile(a)gmx.com to ensure no further communication

1 0

[U-Boot] retrieve proposed patches from mailing list archives?
by Eric Cooper 22 Oct '10

22 Oct '10

I sometimes want to try out a patch that has been proposed on the mailing list. If I no longer have the email in my mailbox, and it hasn't been applied to one of the uboot-*.git trees yet, my only option seems to be to scrape it from the mailman archives, which makes it difficult to use "git am ..." for example. Is there some other way to get the patches or raw emails that I'm missing? -- Eric Cooper e c c @ c m u . e d u

2 2

[U-Boot] [PATCH] net: Add labels to endifs and remove impossible conditional code block
by Gray Remlin 21 Oct '10

21 Oct '10

Labels added to endifs to aid readability of the net/bootp.c file. A block of code was marked for conditional compilation but the condition could never arise, the ifdef\endif code block has been deleted. Signed-off-by: Gray Remlin <g_remlin(a)rocketmail.com> --- net/bootp.c | 93 ++++++++++++++++++++++++++--------------------------------- 1 files changed, 41 insertions(+), 52 deletions(-) diff --git a/net/bootp.c b/net/bootp.c index e679f8b..45abb46 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -66,9 +66,9 @@ static char *dhcpmsg2str(int type) #if defined(CONFIG_BOOTP_VENDOREX) extern u8 *dhcp_vendorex_prep (u8 *e); /*rtn new e after add own opts. */ extern u8 *dhcp_vendorex_proc (u8 *e); /*rtn next e if mine,else NULL */ -#endif +#endif /* CONFIG_BOOTP_VENDOREX */ -#endif +#endif /* CONFIG_CMD_DHCP */ static int BootpCheckPkt(uchar *pkt, unsigned dest, unsigned src, unsigned len) { @@ -112,7 +112,7 @@ static void BootpCopyNetParams(Bootp_t *bp) if (tmp_ip != 0) NetCopyIP(&NetServerIP, &bp->bp_siaddr); memcpy (NetServerEther, ((Ethernet_t *)NetRxPacket)->et_src, 6); -#endif +#endif /* CONFIG_BOOTP_SERVERIP */ if (strlen(bp->bp_file) > 0) copy_filename (BootFile, bp->bp_file, sizeof(BootFile)); @@ -174,7 +174,7 @@ static void BootpVendorFieldProcess (u8 * ext) if ((NetOurDNS2IP == 0) && (size > 4)) { NetCopyIP (&NetOurDNS2IP, (IPaddr_t *) (ext + 2 + 4)); } -#endif +#endif /* CONFIG_BOOTP_DNS2 */ break; case 7: /* Log server - Not yet supported */ break; @@ -300,7 +300,7 @@ BootpHandler(uchar * pkt, unsigned dest, unsigned src, unsigned len) */ #ifdef CONFIG_STATUS_LED status_led_set (STATUS_LED_BOOT, STATUS_LED_OFF); -#endif +#endif /* CONFIG_STATUS_LED */ BootpCopyNetParams(bp); /* Store net parameters from reply */ @@ -327,13 +327,13 @@ BootpHandler(uchar * pkt, unsigned dest, unsigned src, unsigned len) */ NfsStart(); return; -#endif +#endif /* CONFIG_CMD_NFS */ } } TftpStart(); } -#endif +#endif /* CONFIG_CMD_DHCP */ /* * Timeout on BOOTP/DHCP request. @@ -361,10 +361,10 @@ static int DhcpExtended (u8 * e, int message_type, IPaddr_t ServerID, IPaddr_t R #if defined(CONFIG_BOOTP_VENDOREX) u8 *x; -#endif +#endif /* CONFIG_BOOTP_VENDOREX */ #if defined(CONFIG_BOOTP_SEND_HOSTNAME) char *hostname; -#endif +#endif /* CONFIG_BOOTP_SEND_HOSTNAME */ *e++ = 99; /* RFC1048 Magic Cookie */ *e++ = 130; @@ -410,12 +410,12 @@ static int DhcpExtended (u8 * e, int message_type, IPaddr_t ServerID, IPaddr_t R memcpy (e, hostname, hostnamelen); e += hostnamelen; } -#endif +#endif /* CONFIG_BOOTP_SEND_HOSTNAME */ #if defined(CONFIG_BOOTP_VENDOREX) if ((x = dhcp_vendorex_prep (e))) return x - start; -#endif +#endif /* CONFIG_BOOTP_VENDOREX */ *e++ = 55; /* Parameter Request List */ cnt = e++; /* Pointer to count of requested items */ @@ -423,51 +423,51 @@ static int DhcpExtended (u8 * e, int message_type, IPaddr_t ServerID, IPaddr_t R #if defined(CONFIG_BOOTP_SUBNETMASK) *e++ = 1; /* Subnet Mask */ *cnt += 1; -#endif +#endif /* CONFIG_BOOTP_SUBNETMASK */ #if defined(CONFIG_BOOTP_TIMEOFFSET) *e++ = 2; *cnt += 1; -#endif +#endif /* CONFIG_BOOTP_TIMEOFFSET */ #if defined(CONFIG_BOOTP_GATEWAY) *e++ = 3; /* Router Option */ *cnt += 1; -#endif +#endif /* CONFIG_BOOTP_GATEWAY */ #if defined(CONFIG_BOOTP_DNS) *e++ = 6; /* DNS Server(s) */ *cnt += 1; -#endif +#endif /* CONFIG_BOOTP_DNS */ #if defined(CONFIG_BOOTP_HOSTNAME) *e++ = 12; /* Hostname */ *cnt += 1; -#endif +#endif /* CONFIG_BOOTP_HOSTNAME */ #if defined(CONFIG_BOOTP_BOOTFILESIZE) *e++ = 13; /* Boot File Size */ *cnt += 1; -#endif +#endif /* CONFIG_BOOTP_BOOTFILESIZE */ #if defined(CONFIG_BOOTP_BOOTPATH) *e++ = 17; /* Boot path */ *cnt += 1; -#endif +#endif /* CONFIG_BOOTP_BOOTPATH */ #if defined(CONFIG_BOOTP_NISDOMAIN) *e++ = 40; /* NIS Domain name request */ *cnt += 1; -#endif +#endif /* CONFIG_BOOTP_NISDOMAIN */ #if defined(CONFIG_BOOTP_NTPSERVER) *e++ = 42; *cnt += 1; -#endif +#endif /* CONFIG_BOOTP_NTPSERVER */ *e++ = 255; /* End of the list */ /* Pad to minimal length */ #ifdef CONFIG_DHCP_MIN_EXT_LEN while ((e - start) <= CONFIG_DHCP_MIN_EXT_LEN) *e++ = 0; -#endif +#endif /* CONFIG_DHCP_MIN_EXT_LEN */ return e - start; } -#else +#else /* CONFIG_CMD_DHCP */ /* * Warning: no field size check - change CONFIG_BOOTP_* at your own risk! */ @@ -480,64 +480,53 @@ static int BootpExtended (u8 * e) *e++ = 83; *e++ = 99; -#if defined(CONFIG_CMD_DHCP) - *e++ = 53; /* DHCP Message Type */ - *e++ = 1; - *e++ = DHCP_DISCOVER; - - *e++ = 57; /* Maximum DHCP Message Size */ - *e++ = 2; - *e++ = (576 - 312 + OPT_SIZE) >> 16; - *e++ = (576 - 312 + OPT_SIZE) & 0xff; -#endif - #if defined(CONFIG_BOOTP_SUBNETMASK) *e++ = 1; /* Subnet mask request */ *e++ = 4; e += 4; -#endif +#endif /* CONFIG_BOOTP_SUBNETMASK */ #if defined(CONFIG_BOOTP_GATEWAY) *e++ = 3; /* Default gateway request */ *e++ = 4; e += 4; -#endif +#endif /* CONFIG_BOOTP_GATEWAY */ #if defined(CONFIG_BOOTP_DNS) *e++ = 6; /* Domain Name Server */ *e++ = 4; e += 4; -#endif +#endif /* CONFIG_BOOTP_DNS */ #if defined(CONFIG_BOOTP_HOSTNAME) *e++ = 12; /* Host name request */ *e++ = 32; e += 32; -#endif +#endif /* CONFIG_BOOTP_HOSTNAME */ #if defined(CONFIG_BOOTP_BOOTFILESIZE) *e++ = 13; /* Boot file size */ *e++ = 2; e += 2; -#endif +#endif /* CONFIG_BOOTP_BOOTFILESIZE */ #if defined(CONFIG_BOOTP_BOOTPATH) *e++ = 17; /* Boot path */ *e++ = 32; e += 32; -#endif +#endif /* CONFIG_BOOTP_BOOTPATH */ #if defined(CONFIG_BOOTP_NISDOMAIN) *e++ = 40; /* NIS Domain name request */ *e++ = 32; e += 32; -#endif +#endif /* CONFIG_BOOTP_NISDOMAIN */ *e++ = 255; /* End of the list */ return e - start; } -#endif +#endif /* CONFIG_CMD_DHCP */ void BootpRequest (void) @@ -548,7 +537,7 @@ BootpRequest (void) #if defined(CONFIG_CMD_DHCP) dhcp_state = INIT; -#endif +#endif /* CONFIG_CMD_DHCP */ #ifdef CONFIG_BOOTP_RANDOM_DELAY /* Random BOOTP delay */ unsigned char bi_enetaddr[6]; @@ -642,9 +631,9 @@ BootpRequest (void) /* Request additional information from the BOOTP/DHCP server */ #if defined(CONFIG_CMD_DHCP) ext_len = DhcpExtended((u8 *)bp->bp_vend, DHCP_DISCOVER, 0, 0); -#else +#else /* CONFIG_CMD_DHCP */ ext_len = BootpExtended((u8 *)bp->bp_vend); -#endif +#endif /* CONFIG_CMD_DHCP */ /* * Bootp ID is the lower 4 bytes of our ethernet address @@ -670,9 +659,9 @@ BootpRequest (void) #if defined(CONFIG_CMD_DHCP) dhcp_state = SELECTING; NetSetHandler(DhcpHandler); -#else +#else /* CONFIG_CMD_DHCP */ NetSetHandler(BootpHandler); -#endif +#endif /* CONFIG_CMD_DHCP */ NetSendPacket(NetTxPacket, pktlen); } @@ -683,7 +672,7 @@ static void DhcpOptionsProcess (uchar * popt, Bootp_t *bp) int oplen, size; #if defined(CONFIG_CMD_SNTP) && defined(CONFIG_BOOTP_TIMEOFFSET) int *to_ptr; -#endif +#endif /* CONFIG_CMD_SNTP */ while (popt < end && *popt != 0xff) { oplen = *(popt + 1); @@ -697,7 +686,7 @@ static void DhcpOptionsProcess (uchar * popt, Bootp_t *bp) NetCopyLong ((ulong *)to_ptr, (ulong *)(popt + 2)); NetTimeOffset = ntohl (NetTimeOffset); break; -#endif +#endif /* CONFIG_CMD_SNTP */ case 3: NetCopyIP (&NetOurGatewayIP, (popt + 2)); break; @@ -707,7 +696,7 @@ static void DhcpOptionsProcess (uchar * popt, Bootp_t *bp) if (*(popt + 1) > 4) { NetCopyIP (&NetOurDNS2IP, (popt + 2 + 4)); } -#endif +#endif /* CONFIG_BOOTP_DNS2 */ break; case 12: size = truncate_sz ("Host Name", sizeof (NetOurHostName), oplen); @@ -725,7 +714,7 @@ static void DhcpOptionsProcess (uchar * popt, Bootp_t *bp) case 42: /* NTP server IP */ NetCopyIP (&NetNtpServerIP, (popt + 2)); break; -#endif +#endif /* CONFIG_CMD_SNTP && CONFIG_BOOTP_NTPSERVER */ case 51: NetCopyLong (&dhcp_leasetime, (ulong *) (popt + 2)); break; @@ -770,7 +759,7 @@ static void DhcpOptionsProcess (uchar * popt, Bootp_t *bp) #if defined(CONFIG_BOOTP_VENDOREX) if (dhcp_vendorex_proc (popt)) break; -#endif +#endif /* CONFIG_BOOTP_VENDOREX */ printf ("*** Unhandled DHCP Option in OFFER/ACK: %d\n", *popt); break; } @@ -924,7 +913,7 @@ DhcpHandler(uchar * pkt, unsigned dest, unsigned src, unsigned len) */ NfsStart(); return; -#endif +#endif /* CONFIG_CMD_NFS */ } } TftpStart(); --

3 3