From 4b99327a4121a28d2bdb2c2b841f5d97931ae905 Mon Sep 17 00:00:00 2001 From: Richard Retanubun Date: Fri, 15 Jan 2010 10:06:06 -0500 Subject: PPC: Record U-Boot's relocated address in RAM and show in bdinfo. This patch uses gd->relocaddr variable to store uboot's relocated address in RAM and shows it in bdinfo command. This patch moves CONFIG_AMIGAONEG3SE style copying of the address in board_init_f to just before relocation is actually done. Signed-off-by: Richard Retanubun Tested-by: Detlev Zundel --- include/asm-ppc/global_data.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'include') diff --git a/include/asm-ppc/global_data.h b/include/asm-ppc/global_data.h index 3f11918746..d3dd44e96d 100644 --- a/include/asm-ppc/global_data.h +++ b/include/asm-ppc/global_data.h @@ -152,9 +152,7 @@ typedef struct global_data { defined(CONFIG_SANDPOINT) void * console_addr; #endif -#ifdef CONFIG_AMIGAONEG3SE unsigned long relocaddr; /* Start address of U-Boot in RAM */ -#endif #if defined(CONFIG_LCD) || defined(CONFIG_VIDEO) unsigned long fb_base; /* Base address of framebuffer memory */ #endif -- cgit From 7026ead0d3ece5e43d6b39f62fb5c4306f691224 Mon Sep 17 00:00:00 2001 From: Heiko Schocher Date: Tue, 9 Feb 2010 15:50:27 +0100 Subject: TQM8xx: enable device tree support on all TQM8xx based boards. Also enable support for CONFIG_HWCONFIG because we use this for configuring if this hardware has a FEC or not. syntax: hwconfig=fec:on if hardware has an fec hwconfig=fec:off if hardware has no fec Signed-off-by: Heiko Schocher Signed-off-by: Wolfgang Denk --- include/configs/FPS850L.h | 5 +++++ include/configs/FPS860L.h | 5 +++++ include/configs/HMI10.h | 5 +++++ include/configs/NSCU.h | 5 +++++ include/configs/SM850.h | 5 +++++ include/configs/TK885D.h | 5 +++++ include/configs/TQM823L.h | 5 +++++ include/configs/TQM823M.h | 5 +++++ include/configs/TQM850L.h | 5 +++++ include/configs/TQM850M.h | 5 +++++ include/configs/TQM855L.h | 5 +++++ include/configs/TQM855M.h | 5 +++++ include/configs/TQM860L.h | 5 +++++ include/configs/TQM860M.h | 5 +++++ include/configs/TQM862L.h | 5 +++++ include/configs/TQM862M.h | 5 +++++ include/configs/TQM866M.h | 5 +++++ include/configs/TQM885D.h | 5 +++++ include/configs/virtlab2.h | 6 ++++++ 19 files changed, 96 insertions(+) (limited to 'include') diff --git a/include/configs/FPS850L.h b/include/configs/FPS850L.h index 119065671a..addca2fe3a 100644 --- a/include/configs/FPS850L.h +++ b/include/configs/FPS850L.h @@ -437,4 +437,9 @@ #define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ #define BOOTFLAG_WARM 0x02 /* Software reboot */ +/* pass open firmware flat tree */ +#define CONFIG_OF_LIBFDT 1 +#define CONFIG_OF_BOARD_SETUP 1 +#define CONFIG_HWCONFIG 1 + #endif /* __CONFIG_H */ diff --git a/include/configs/FPS860L.h b/include/configs/FPS860L.h index 73bcccc2ec..ec9000d9fc 100644 --- a/include/configs/FPS860L.h +++ b/include/configs/FPS860L.h @@ -439,4 +439,9 @@ #define CONFIG_SCC1_ENET +/* pass open firmware flat tree */ +#define CONFIG_OF_LIBFDT 1 +#define CONFIG_OF_BOARD_SETUP 1 +#define CONFIG_HWCONFIG 1 + #endif /* __CONFIG_H */ diff --git a/include/configs/HMI10.h b/include/configs/HMI10.h index 88e1946b78..2747d8cce8 100644 --- a/include/configs/HMI10.h +++ b/include/configs/HMI10.h @@ -496,4 +496,9 @@ #define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ #define BOOTFLAG_WARM 0x02 /* Software reboot */ +/* pass open firmware flat tree */ +#define CONFIG_OF_LIBFDT 1 +#define CONFIG_OF_BOARD_SETUP 1 +#define CONFIG_HWCONFIG 1 + #endif /* __CONFIG_H */ diff --git a/include/configs/NSCU.h b/include/configs/NSCU.h index 5dd72ffaf4..5724f45a8d 100644 --- a/include/configs/NSCU.h +++ b/include/configs/NSCU.h @@ -487,4 +487,9 @@ #define CONFIG_FEC_ENET /* #define CONFIG_ETHPRIME "FEC ETHERNET" */ +/* pass open firmware flat tree */ +#define CONFIG_OF_LIBFDT 1 +#define CONFIG_OF_BOARD_SETUP 1 +#define CONFIG_HWCONFIG 1 + #endif /* __CONFIG_H */ diff --git a/include/configs/SM850.h b/include/configs/SM850.h index 7266f9add1..56f03e2b88 100644 --- a/include/configs/SM850.h +++ b/include/configs/SM850.h @@ -372,4 +372,9 @@ #define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ #define BOOTFLAG_WARM 0x02 /* Software reboot */ +/* pass open firmware flat tree */ +#define CONFIG_OF_LIBFDT 1 +#define CONFIG_OF_BOARD_SETUP 1 +#define CONFIG_HWCONFIG 1 + #endif /* __CONFIG_H */ diff --git a/include/configs/TK885D.h b/include/configs/TK885D.h index 1e6d9cebe0..0df1b6e042 100644 --- a/include/configs/TK885D.h +++ b/include/configs/TK885D.h @@ -516,4 +516,9 @@ #define CONFIG_NET_RETRY_COUNT 3 #define CONFIG_ETHPRIME "FEC ETHERNET" +/* pass open firmware flat tree */ +#define CONFIG_OF_LIBFDT 1 +#define CONFIG_OF_BOARD_SETUP 1 +#define CONFIG_HWCONFIG 1 + #endif /* __CONFIG_H */ diff --git a/include/configs/TQM823L.h b/include/configs/TQM823L.h index 966beaea16..372c76dcc8 100644 --- a/include/configs/TQM823L.h +++ b/include/configs/TQM823L.h @@ -490,4 +490,9 @@ #define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ #define BOOTFLAG_WARM 0x02 /* Software reboot */ +/* pass open firmware flat tree */ +#define CONFIG_OF_LIBFDT 1 +#define CONFIG_OF_BOARD_SETUP 1 +#define CONFIG_HWCONFIG 1 + #endif /* __CONFIG_H */ diff --git a/include/configs/TQM823M.h b/include/configs/TQM823M.h index cfa693da18..64c97071d6 100644 --- a/include/configs/TQM823M.h +++ b/include/configs/TQM823M.h @@ -486,4 +486,9 @@ #define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ #define BOOTFLAG_WARM 0x02 /* Software reboot */ +/* pass open firmware flat tree */ +#define CONFIG_OF_LIBFDT 1 +#define CONFIG_OF_BOARD_SETUP 1 +#define CONFIG_HWCONFIG 1 + #endif /* __CONFIG_H */ diff --git a/include/configs/TQM850L.h b/include/configs/TQM850L.h index dc0498e7d1..bf6ecce470 100644 --- a/include/configs/TQM850L.h +++ b/include/configs/TQM850L.h @@ -475,4 +475,9 @@ #define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ #define BOOTFLAG_WARM 0x02 /* Software reboot */ +/* pass open firmware flat tree */ +#define CONFIG_OF_LIBFDT 1 +#define CONFIG_OF_BOARD_SETUP 1 +#define CONFIG_HWCONFIG 1 + #endif /* __CONFIG_H */ diff --git a/include/configs/TQM850M.h b/include/configs/TQM850M.h index cdabc53085..74424527b8 100644 --- a/include/configs/TQM850M.h +++ b/include/configs/TQM850M.h @@ -475,4 +475,9 @@ #define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ #define BOOTFLAG_WARM 0x02 /* Software reboot */ +/* pass open firmware flat tree */ +#define CONFIG_OF_LIBFDT 1 +#define CONFIG_OF_BOARD_SETUP 1 +#define CONFIG_HWCONFIG 1 + #endif /* __CONFIG_H */ diff --git a/include/configs/TQM855L.h b/include/configs/TQM855L.h index 1255928fb5..32a7e79a4b 100644 --- a/include/configs/TQM855L.h +++ b/include/configs/TQM855L.h @@ -483,4 +483,9 @@ #define CONFIG_FEC_ENET #define CONFIG_ETHPRIME "SCC ETHERNET" +/* pass open firmware flat tree */ +#define CONFIG_OF_LIBFDT 1 +#define CONFIG_OF_BOARD_SETUP 1 +#define CONFIG_HWCONFIG 1 + #endif /* __CONFIG_H */ diff --git a/include/configs/TQM855M.h b/include/configs/TQM855M.h index 584d40be93..4f44be31bb 100644 --- a/include/configs/TQM855M.h +++ b/include/configs/TQM855M.h @@ -518,4 +518,9 @@ #define CONFIG_FEC_ENET #define CONFIG_ETHPRIME "SCC ETHERNET" +/* pass open firmware flat tree */ +#define CONFIG_OF_LIBFDT 1 +#define CONFIG_OF_BOARD_SETUP 1 +#define CONFIG_HWCONFIG 1 + #endif /* __CONFIG_H */ diff --git a/include/configs/TQM860L.h b/include/configs/TQM860L.h index a772a27bec..e86fe5ef96 100644 --- a/include/configs/TQM860L.h +++ b/include/configs/TQM860L.h @@ -482,4 +482,9 @@ #define CONFIG_FEC_ENET #define CONFIG_ETHPRIME "SCC ETHERNET" +/* pass open firmware flat tree */ +#define CONFIG_OF_LIBFDT 1 +#define CONFIG_OF_BOARD_SETUP 1 +#define CONFIG_HWCONFIG 1 + #endif /* __CONFIG_H */ diff --git a/include/configs/TQM860M.h b/include/configs/TQM860M.h index 7c347861f0..4fd873b1bd 100644 --- a/include/configs/TQM860M.h +++ b/include/configs/TQM860M.h @@ -486,4 +486,9 @@ #define CONFIG_FEC_ENET #define CONFIG_ETHPRIME "SCC ETHERNET" +/* pass open firmware flat tree */ +#define CONFIG_OF_LIBFDT 1 +#define CONFIG_OF_BOARD_SETUP 1 +#define CONFIG_HWCONFIG 1 + #endif /* __CONFIG_H */ diff --git a/include/configs/TQM862L.h b/include/configs/TQM862L.h index 75d2dacba6..0c966c9e0c 100644 --- a/include/configs/TQM862L.h +++ b/include/configs/TQM862L.h @@ -488,4 +488,9 @@ #define CONFIG_FEC_ENET #define CONFIG_ETHPRIME "SCC ETHERNET" +/* pass open firmware flat tree */ +#define CONFIG_OF_LIBFDT 1 +#define CONFIG_OF_BOARD_SETUP 1 +#define CONFIG_HWCONFIG 1 + #endif /* __CONFIG_H */ diff --git a/include/configs/TQM862M.h b/include/configs/TQM862M.h index 0c7aacdce6..178e6e2137 100644 --- a/include/configs/TQM862M.h +++ b/include/configs/TQM862M.h @@ -489,4 +489,9 @@ #define CONFIG_FEC_ENET #define CONFIG_ETHPRIME "SCC ETHERNET" +/* pass open firmware flat tree */ +#define CONFIG_OF_LIBFDT 1 +#define CONFIG_OF_BOARD_SETUP 1 +#define CONFIG_HWCONFIG 1 + #endif /* __CONFIG_H */ diff --git a/include/configs/TQM866M.h b/include/configs/TQM866M.h index 071afd4f3f..a65946deb2 100644 --- a/include/configs/TQM866M.h +++ b/include/configs/TQM866M.h @@ -508,4 +508,9 @@ #define CONFIG_FEC_ENET #define CONFIG_ETHPRIME "SCC ETHERNET" +/* pass open firmware flat tree */ +#define CONFIG_OF_LIBFDT 1 +#define CONFIG_OF_BOARD_SETUP 1 +#define CONFIG_HWCONFIG 1 + #endif /* __CONFIG_H */ diff --git a/include/configs/TQM885D.h b/include/configs/TQM885D.h index d435819aaa..0fc4b69acf 100644 --- a/include/configs/TQM885D.h +++ b/include/configs/TQM885D.h @@ -508,4 +508,9 @@ #define CONFIG_ETHPRIME "SCC ETHERNET" +/* pass open firmware flat tree */ +#define CONFIG_OF_LIBFDT 1 +#define CONFIG_OF_BOARD_SETUP 1 +#define CONFIG_HWCONFIG 1 + #endif /* __CONFIG_H */ diff --git a/include/configs/virtlab2.h b/include/configs/virtlab2.h index f7813a1ff6..7046e6739d 100644 --- a/include/configs/virtlab2.h +++ b/include/configs/virtlab2.h @@ -491,4 +491,10 @@ OR_SCY_2_CLK) #define CONFIG_SYS_BR4_PRELIM ((CONFIG_SYS_PERIPHERAL_BASE & BR_BA_MSK) | BR_PS_8 | BR_V) #define PCMCIA_CTRL (CONFIG_SYS_PERIPHERAL_BASE + 0xB00) + +/* pass open firmware flat tree */ +#define CONFIG_OF_LIBFDT 1 +#define CONFIG_OF_BOARD_SETUP 1 +#define CONFIG_HWCONFIG 1 + #endif /* __CONFIG_H */ -- cgit From ca02f6f8dc4966b2a019b15e01b5070189327df2 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Wed, 10 Mar 2010 17:16:48 -0600 Subject: 85xx: Drop FIT support to allow u-boot image to fit in 512k The 36-bit build exceeds the 512k size we have. Removing FIT type image support allows us to fit and we dont really use it. Signed-off-by: Kumar Gala --- include/configs/P2020DS.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'include') diff --git a/include/configs/P2020DS.h b/include/configs/P2020DS.h index f4509bd090..30a5a319bc 100644 --- a/include/configs/P2020DS.h +++ b/include/configs/P2020DS.h @@ -400,10 +400,6 @@ extern unsigned long calculate_board_ddr_clk(unsigned long dummy); #define CONFIG_OF_BOARD_SETUP 1 #define CONFIG_OF_STDOUT_VIA_ALIAS 1 -/* new uImage format support */ -#define CONFIG_FIT 1 -#define CONFIG_FIT_VERBOSE 1 /* enable fit_format_{error,warning}() */ - /* I2C */ #define CONFIG_FSL_I2C /* Use FSL common I2C driver */ #define CONFIG_HARD_I2C /* I2C with hardware support */ -- cgit From 9c9cbe78dcb0afad081670cb1bdc82d227095cae Mon Sep 17 00:00:00 2001 From: Detlev Zundel Date: Mon, 8 Mar 2010 14:02:57 +0100 Subject: mpc82xx: Remove SL8245 board and the now orpahned sk98lin network driver. This code has compile problems and the company does not even exist any more. So we take the liberty to drop support for it. Signed-off-by: Detlev Zundel CC: Wolfgang Denk CC: Ben Warren --- include/configs/SL8245.h | 294 ----------------------------------------------- 1 file changed, 294 deletions(-) delete mode 100644 include/configs/SL8245.h (limited to 'include') diff --git a/include/configs/SL8245.h b/include/configs/SL8245.h deleted file mode 100644 index 876d8828a2..0000000000 --- a/include/configs/SL8245.h +++ /dev/null @@ -1,294 +0,0 @@ -/* - * (C) Copyright 2001 - 2003 - * Wolfgang Denk, DENX Software Engineering, wd@denx.de. - * - * 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 - */ - -/* ------------------------------------------------------------------------- */ -/* - * Configuration settings for the SL8245 board. - */ - -/* ------------------------------------------------------------------------- */ - -/* - * board/config.h - configuration options, board specific - */ - -#ifndef __CONFIG_H -#define __CONFIG_H - -/* - * High Level Configuration Options - * (easy to change) - */ - -#define CONFIG_MPC824X 1 -#define CONFIG_MPC8245 1 -#define CONFIG_SL8245 1 - - -#define CONFIG_CONS_INDEX 1 -#define CONFIG_BAUDRATE 115200 -#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } - -#define CONFIG_BOOTDELAY 5 - -#define CONFIG_TIMESTAMP /* Print image info with timestamp */ - - -/* - * BOOTP options - */ -#define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_BOOTP_BOOTPATH -#define CONFIG_BOOTP_GATEWAY -#define CONFIG_BOOTP_HOSTNAME - - -/* - * Command line configuration. - */ -#include - -#define CONFIG_CMD_PCI - - -/* - * Miscellaneous configurable options - */ -#undef CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_SYS_PROMPT "=> " /* Monitor Command Prompt */ -#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ - -/* Print Buffer Size - */ -#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) -#define CONFIG_SYS_MAXARGS 32 /* Max number of command args */ -#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */ -#define CONFIG_SYS_LOAD_ADDR 0x00400000 /* Default load address */ - -/*----------------------------------------------------------------------- - * Start addresses for the final memory configuration - * (Set up by the startup code) - * Please note that CONFIG_SYS_SDRAM_BASE _must_ start at 0 - */ -#define CONFIG_SYS_SDRAM_BASE 0x00000000 - -#define CONFIG_SYS_FLASH_BASE0_PRELIM 0xFF800000 /* FLASH bank on RCS#0 */ -#define CONFIG_SYS_FLASH_BASE CONFIG_SYS_FLASH_BASE0_PRELIM -#define CONFIG_SYS_FLASH_BANKS { CONFIG_SYS_FLASH_BASE0_PRELIM } - -#define CONFIG_SYS_RESET_ADDRESS 0xFFF00100 - -#define CONFIG_SYS_EUMB_ADDR 0xFC000000 - -#define CONFIG_SYS_MONITOR_BASE TEXT_BASE -#define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 256 kB for Monitor */ -#define CONFIG_SYS_MALLOC_LEN (128 << 10) /* Reserve 128 kB for malloc() */ - -#define CONFIG_SYS_MEMTEST_START 0x00004000 /* memtest works on */ -#define CONFIG_SYS_MEMTEST_END 0x02000000 /* 0 ... 32 MB in DRAM */ - - /* Maximum amount of RAM. - */ -#define CONFIG_SYS_MAX_RAM_SIZE 0x10000000 /* 0 .. 256 MB of (S)DRAM */ - - -#if CONFIG_SYS_MONITOR_BASE >= CONFIG_SYS_FLASH_BASE -#undef CONFIG_SYS_RAMBOOT -#else -#define CONFIG_SYS_RAMBOOT -#endif - -/* - * NS16550 Configuration - */ -#define CONFIG_SYS_NS16550 -#define CONFIG_SYS_NS16550_SERIAL - -#define CONFIG_SYS_NS16550_REG_SIZE 1 - -#define CONFIG_SYS_NS16550_CLK get_bus_freq(0) - -#define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_EUMB_ADDR + 0x4500) - -/*----------------------------------------------------------------------- - * Definitions for initial stack pointer and data area - */ - -#define CONFIG_SYS_GBL_DATA_SIZE 128 -#define CONFIG_SYS_INIT_RAM_ADDR 0x40000000 -#define CONFIG_SYS_INIT_RAM_END 0x1000 -#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE) - -/* - * Low Level Configuration Settings - * (address mappings, register initial values, etc.) - * You should know what you are doing if you make changes here. - * For the detail description refer to the MPC8240 user's manual. - */ - -#define CONFIG_SYS_CLK_FREQ 66666666 /* external frequency to pll */ -#define CONFIG_SYS_HZ 1000 - - /* Bit-field values for MCCR1. - */ -#define CONFIG_SYS_ROMNAL 0 -#define CONFIG_SYS_ROMFAL 7 -#define CONFIG_SYS_BANK0_ROW 2 - - /* Bit-field values for MCCR2. - */ -#define CONFIG_SYS_REFINT 0x400 /* Refresh interval FIXME: was 0t430 */ - - /* Burst To Precharge. Bits of this value go to MCCR3 and MCCR4. - */ -#define CONFIG_SYS_BSTOPRE 192 - - /* Bit-field values for MCCR3. - */ -#define CONFIG_SYS_REFREC 2 /* Refresh to activate interval */ - - /* Bit-field values for MCCR4. - */ -#define CONFIG_SYS_PRETOACT 2 /* Precharge to activate interval */ -#define CONFIG_SYS_ACTTOPRE 5 /* Activate to Precharge interval */ -#define CONFIG_SYS_ACTORW 3 /* FIXME was 2 */ -#define CONFIG_SYS_SDMODE_CAS_LAT 3 /* SDMODE CAS latancy */ -#define CONFIG_SYS_SDMODE_WRAP 0 /* SDMODE wrap type */ -#define CONFIG_SYS_REGISTERD_TYPE_BUFFER 1 -#define CONFIG_SYS_EXTROM 1 -#define CONFIG_SYS_REGDIMM 0 - -#define CONFIG_SYS_ODCR 0xff /* configures line driver impedances, */ - /* see 8245 book for bit definitions */ -#define CONFIG_SYS_PGMAX 0x32 /* how long the 8245 retains the */ - /* currently accessed page in memory */ - /* see 8245 book for details */ - -/* Memory bank settings. - * Only bits 20-29 are actually used from these vales to set the - * start/end addresses. The upper two bits will always be 0, and the lower - * 20 bits will be 0x00000 for a start address, or 0xfffff for an end - * address. Refer to the MPC8240 book. - */ - -#define CONFIG_SYS_BANK0_START 0x00000000 -#define CONFIG_SYS_BANK0_END (CONFIG_SYS_MAX_RAM_SIZE - 1) -#define CONFIG_SYS_BANK0_ENABLE 1 -#define CONFIG_SYS_BANK1_START 0x3ff00000 -#define CONFIG_SYS_BANK1_END 0x3fffffff -#define CONFIG_SYS_BANK1_ENABLE 0 -#define CONFIG_SYS_BANK2_START 0x3ff00000 -#define CONFIG_SYS_BANK2_END 0x3fffffff -#define CONFIG_SYS_BANK2_ENABLE 0 -#define CONFIG_SYS_BANK3_START 0x3ff00000 -#define CONFIG_SYS_BANK3_END 0x3fffffff -#define CONFIG_SYS_BANK3_ENABLE 0 -#define CONFIG_SYS_BANK4_START 0x3ff00000 -#define CONFIG_SYS_BANK4_END 0x3fffffff -#define CONFIG_SYS_BANK4_ENABLE 0 -#define CONFIG_SYS_BANK5_START 0x3ff00000 -#define CONFIG_SYS_BANK5_END 0x3fffffff -#define CONFIG_SYS_BANK5_ENABLE 0 -#define CONFIG_SYS_BANK6_START 0x3ff00000 -#define CONFIG_SYS_BANK6_END 0x3fffffff -#define CONFIG_SYS_BANK6_ENABLE 0 -#define CONFIG_SYS_BANK7_START 0x3ff00000 -#define CONFIG_SYS_BANK7_END 0x3fffffff -#define CONFIG_SYS_BANK7_ENABLE 0 - -#define CONFIG_SYS_IBAT0L (CONFIG_SYS_SDRAM_BASE | BATL_PP_10 | BATL_MEMCOHERENCE) -#define CONFIG_SYS_IBAT0U (CONFIG_SYS_SDRAM_BASE | BATU_BL_256M | BATU_VS | BATU_VP) - -#define CONFIG_SYS_IBAT1L (CONFIG_SYS_INIT_RAM_ADDR | BATL_PP_10 | BATL_MEMCOHERENCE) -#define CONFIG_SYS_IBAT1U (CONFIG_SYS_INIT_RAM_ADDR | BATU_BL_128K | BATU_VS | BATU_VP) - -#define CONFIG_SYS_IBAT2L (0x80000000 | BATL_PP_10 | BATL_CACHEINHIBIT) -#define CONFIG_SYS_IBAT2U (0x80000000 | BATU_BL_256M | BATU_VS | BATU_VP) - -#define CONFIG_SYS_IBAT3L (0xF0000000 | BATL_PP_10 | BATL_CACHEINHIBIT) -#define CONFIG_SYS_IBAT3U (0xF0000000 | BATU_BL_256M | BATU_VS | BATU_VP) - -#define CONFIG_SYS_DBAT0L CONFIG_SYS_IBAT0L -#define CONFIG_SYS_DBAT0U CONFIG_SYS_IBAT0U -#define CONFIG_SYS_DBAT1L CONFIG_SYS_IBAT1L -#define CONFIG_SYS_DBAT1U CONFIG_SYS_IBAT1U -#define CONFIG_SYS_DBAT2L CONFIG_SYS_IBAT2L -#define CONFIG_SYS_DBAT2U CONFIG_SYS_IBAT2U -#define CONFIG_SYS_DBAT3L CONFIG_SYS_IBAT3L -#define CONFIG_SYS_DBAT3U CONFIG_SYS_IBAT3U - -/* - * For booting Linux, the board info and command line data - * have to be in the first 8 MB of memory, since this is - * the maximum mapped by the Linux kernel during initialization. - */ -#define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */ - -/*----------------------------------------------------------------------- - * FLASH organization - */ -#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* Max number of flash banks */ -#define CONFIG_SYS_MAX_FLASH_SECT 35 /* Max number of sectors per flash */ - -#define CONFIG_SYS_FLASH_ERASE_TOUT 120000 /* Timeout for Flash Erase (in ms) */ -#define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ - - - /* Warining: environment is not EMBEDDED in the U-Boot code. - * It's stored in flash separately. - */ -#define CONFIG_ENV_IS_IN_FLASH 1 -#define CONFIG_ENV_ADDR 0xFFFF0000 -#define CONFIG_ENV_SIZE 0x00010000 /* Size of the Environment */ -#define CONFIG_ENV_SECT_SIZE 0x00010000 /* Size of the Environment Sector */ - -/*----------------------------------------------------------------------- - * Cache Configuration - */ -#define CONFIG_SYS_CACHELINE_SIZE 32 -#if defined(CONFIG_CMD_KGDB) -# define CONFIG_SYS_CACHELINE_SHIFT 5 /* log base 2 of the above value */ -#endif - -/* - * Internal Definitions - * - * Boot Flags - */ -#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ -#define BOOTFLAG_WARM 0x02 /* Software reboot */ - -/*----------------------------------------------------------------------- - * PCI stuff - *----------------------------------------------------------------------- - */ -#define CONFIG_PCI -#define CONFIG_PCI_PNP -#undef CONFIG_PCI_SCAN_SHOW - - -#define CONFIG_SK98 -#define CONFIG_NET_MULTI - - -#endif /* __CONFIG_H */ -- cgit From 93910edb595a88d394da3eb2cf5148096155dfe9 Mon Sep 17 00:00:00 2001 From: Wolfgang Denk Date: Fri, 12 Mar 2010 23:06:04 +0100 Subject: Prepare v2010.03-rc1 Coding style cleanup, update CHANGELOG. Signed-off-by: Wolfgang Denk --- include/asm-arm/arch-a320/a320.h | 1 - include/configs/ipek01.h | 3 --- include/pca9564.h | 1 - include/usb/musb_udc.h | 1 - 4 files changed, 6 deletions(-) (limited to 'include') diff --git a/include/asm-arm/arch-a320/a320.h b/include/asm-arm/arch-a320/a320.h index 5c0a097507..fbd1583f50 100644 --- a/include/asm-arm/arch-a320/a320.h +++ b/include/asm-arm/arch-a320/a320.h @@ -32,4 +32,3 @@ #define CONFIG_FTRTC010_BASE 0x98600000 /* Real Time Clock*/ #endif /* __A320_H */ - diff --git a/include/configs/ipek01.h b/include/configs/ipek01.h index d9028fae3c..d0cb1e1d60 100644 --- a/include/configs/ipek01.h +++ b/include/configs/ipek01.h @@ -267,8 +267,6 @@ /* End of used area in DPRAM */ #define CONFIG_SYS_INIT_RAM_END MPC5XXX_SRAM_SIZE - - /* size in bytes reserved for initial data */ #define CONFIG_SYS_GBL_DATA_SIZE 128 @@ -315,7 +313,6 @@ /* Boot Argument Buffer Size */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE - #define CONFIG_SYS_MEMTEST_START 0x00100000 /* memtest works on */ #define CONFIG_SYS_MEMTEST_END 0x00f00000 /* 1...15 MB in DRAM */ diff --git a/include/pca9564.h b/include/pca9564.h index 3e75259e09..b80d2e6210 100644 --- a/include/pca9564.h +++ b/include/pca9564.h @@ -47,4 +47,3 @@ #define PCA_CON_CR 0x07 /* Clock Rate (MASK) */ #endif - diff --git a/include/usb/musb_udc.h b/include/usb/musb_udc.h index ef37dbbcc4..be808fd516 100644 --- a/include/usb/musb_udc.h +++ b/include/usb/musb_udc.h @@ -51,4 +51,3 @@ int udc_init(void); #endif /* CONFIG_USB_TTY */ #endif /* __MUSB_UDC_H__ */ - -- cgit From 3adc1fda38a6aacd4aaf3c2c9cc62a1e69e6de17 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 21 Jan 2010 05:01:14 -0500 Subject: asm-generic/unaligned.h: dynamic default unaligned accesses This is based on the asm-arm/unaligned.h, but made generic so all arches that cannot do unaligned accesses can utilize it. Signed-off-by: Mike Frysinger --- include/asm-generic/unaligned.h | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 include/asm-generic/unaligned.h (limited to 'include') diff --git a/include/asm-generic/unaligned.h b/include/asm-generic/unaligned.h new file mode 100644 index 0000000000..fd0255099a --- /dev/null +++ b/include/asm-generic/unaligned.h @@ -0,0 +1,23 @@ +#ifndef _GENERIC_UNALIGNED_H +#define _GENERIC_UNALIGNED_H + +#include + +#include +#include +#include + +/* + * Select endianness + */ +#if defined(__LITTLE_ENDIAN) +#define get_unaligned __get_unaligned_le +#define put_unaligned __put_unaligned_le +#elif defined(__BIG_ENDIAN) +#define get_unaligned __get_unaligned_be +#define put_unaligned __put_unaligned_be +#else +#error invalid endian +#endif + +#endif -- cgit From 05022629a2ca6c385dc390d32c20aa27cf5d915a Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 21 Jan 2010 05:01:15 -0500 Subject: asm-blackfin/unaligned.h: add for zlib code The new zlib code wants asm/unaligned.h, so have the Blackfin version pull in the asm-generic/unaligned.h. Signed-off-by: Mike Frysinger --- include/asm-blackfin/unaligned.h | 1 + 1 file changed, 1 insertion(+) create mode 100644 include/asm-blackfin/unaligned.h (limited to 'include') diff --git a/include/asm-blackfin/unaligned.h b/include/asm-blackfin/unaligned.h new file mode 100644 index 0000000000..6cecbbb211 --- /dev/null +++ b/include/asm-blackfin/unaligned.h @@ -0,0 +1 @@ +#include -- cgit From 1e67fb32fbdae7949bb423c9e20b3f77c0a61663 Mon Sep 17 00:00:00 2001 From: Thomas Chou Date: Tue, 16 Mar 2010 12:12:48 -0400 Subject: nios2: use generic unaligned.h Signed-off-by: Scott McNutt --- include/asm-nios2/unaligned.h | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 include/asm-nios2/unaligned.h (limited to 'include') diff --git a/include/asm-nios2/unaligned.h b/include/asm-nios2/unaligned.h new file mode 100644 index 0000000000..779117c4bc --- /dev/null +++ b/include/asm-nios2/unaligned.h @@ -0,0 +1,6 @@ +#ifndef _ASM_NIOS2_UNALIGNED_H +#define _ASM_NIOS2_UNALIGNED_H + +#include + +#endif /* _ASM_NIOS2_UNALIGNED_H */ -- cgit From 67c7189dd35cb368ef665126fd17816581bd2e92 Mon Sep 17 00:00:00 2001 From: Renato Andreola Date: Tue, 16 Mar 2010 16:01:29 -0400 Subject: nios2: Added support to YANU UART Signed-off-by: Scott McNutt --- include/nios2-yanu.h | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) create mode 100644 include/nios2-yanu.h (limited to 'include') diff --git a/include/nios2-yanu.h b/include/nios2-yanu.h new file mode 100644 index 0000000000..1c9a967932 --- /dev/null +++ b/include/nios2-yanu.h @@ -0,0 +1,115 @@ +/* + * (C) Copyright 2006, Imagos S.a.s + * Renato Andreola + * + * 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 + */ + +/************************************************************************* + * Altera NiosII YANU serial interface by Imagos + * please see http://www.opencores.org/project,yanu for + * information/downloads + ************************************************************************/ + +#ifndef __NIOS2_YANU_H__ +#define __NIOS2_YANU_H__ + +#define YANU_MAX_PRESCALER_N ((1 << 4) - 1) /* 15 */ +#define YANU_MAX_PRESCALER_M ((1 << 11) -1) /* 2047 */ +#define YANU_FIFO_SIZE (16) +#define YANU_RXFIFO_SIZE (YANU_FIFO_SIZE) +#define YANU_TXFIFO_SIZE (YANU_FIFO_SIZE) + +#define YANU_RXFIFO_DLY (10*11) +#define YANU_TXFIFO_THR (10) +#define YANU_DATA_CHAR_MASK (0xFF) + +/* data register */ +#define YANU_DATA_OFFSET (0) /* data register offset */ + +#define YANU_CONTROL_OFFSET (4) /* control register offset */ +/* interrupt enable */ +#define YANU_CONTROL_IE_RRDY (1<<0) /* ie on received character ready */ +#define YANU_CONTROL_IE_OE (1<<1) /* ie on rx overrun */ +#define YANU_CONTROL_IE_BRK (1<<2) /* ie on break detect */ +#define YANU_CONTROL_IE_FE (1<<3) /* ie on framing error */ +#define YANU_CONTROL_IE_PE (1<<4) /* ie on parity error */ +#define YANU_CONTROL_IE_TRDY (1<<5) /* ie interrupt on tranmitter ready */ +/* control bits */ +#define YANU_CONTROL_BITS_POS (6) /* bits number pos */ +#define YANU_CONTROL_BITS (1< Date: Sat, 13 Mar 2010 23:14:45 +0100 Subject: mod change 755 => 644 for multiple files I executed 'find . -name "*.[chS]" -perm 755 -exec chmod 644 {} \;' Signed-off-by: Thomas Weber Add some more: neither Makefile nor config.mk need execute permissions. Signed-off-by: Wolfgang Denk --- include/asm-arm/arch-spear/spr_gpt.h | 0 include/asm-arm/arch-spear/spr_i2c.h | 0 include/asm-arm/arch-spear/spr_smi.h | 0 include/asm-arm/arch-spear/spr_xloader_table.h | 0 include/configs/spear3xx.h | 0 include/configs/spear6xx.h | 0 include/usb/spr_udc.h | 0 7 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 include/asm-arm/arch-spear/spr_gpt.h mode change 100755 => 100644 include/asm-arm/arch-spear/spr_i2c.h mode change 100755 => 100644 include/asm-arm/arch-spear/spr_smi.h mode change 100755 => 100644 include/asm-arm/arch-spear/spr_xloader_table.h mode change 100755 => 100644 include/configs/spear3xx.h mode change 100755 => 100644 include/configs/spear6xx.h mode change 100755 => 100644 include/usb/spr_udc.h (limited to 'include') diff --git a/include/asm-arm/arch-spear/spr_gpt.h b/include/asm-arm/arch-spear/spr_gpt.h old mode 100755 new mode 100644 diff --git a/include/asm-arm/arch-spear/spr_i2c.h b/include/asm-arm/arch-spear/spr_i2c.h old mode 100755 new mode 100644 diff --git a/include/asm-arm/arch-spear/spr_smi.h b/include/asm-arm/arch-spear/spr_smi.h old mode 100755 new mode 100644 diff --git a/include/asm-arm/arch-spear/spr_xloader_table.h b/include/asm-arm/arch-spear/spr_xloader_table.h old mode 100755 new mode 100644 diff --git a/include/configs/spear3xx.h b/include/configs/spear3xx.h old mode 100755 new mode 100644 diff --git a/include/configs/spear6xx.h b/include/configs/spear6xx.h old mode 100755 new mode 100644 diff --git a/include/usb/spr_udc.h b/include/usb/spr_udc.h old mode 100755 new mode 100644 -- cgit From daa989b47297c9f73426783599c286ef3a1f3f49 Mon Sep 17 00:00:00 2001 From: Asen Dimov Date: Thu, 18 Mar 2010 13:41:47 +0200 Subject: correct a syntax typo in at91_matrix.h Signed-off-by: Asen Dimov --- include/asm-arm/arch-at91/at91_matrix.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/asm-arm/arch-at91/at91_matrix.h b/include/asm-arm/arch-at91/at91_matrix.h index 9b3c110f52..981ec2029c 100644 --- a/include/asm-arm/arch-at91/at91_matrix.h +++ b/include/asm-arm/arch-at91/at91_matrix.h @@ -80,7 +80,7 @@ typedef struct at91_matrix { u32 mrcr; /* 0x100 Master Remap Control */ u32 reserve4[3]; #if defined(CONFIG_AT91SAM9G45) - u32 ccr[52] /* 0x110 - 0x1E0 Chip Configuration */ + u32 ccr[52]; /* 0x110 - 0x1E0 Chip Configuration */ u32 womr; /* 0x1E4 Write Protect Mode */ u32 wpsr; /* 0x1E8 Write Protect Status */ u32 resg45_1[10]; -- cgit