summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* Merge branch 'master' of git://git.denx.de/u-boot-blackfinWolfgang Denk2011-04-10-4930/+8203
|\
| * Blackfin: bf526-ezbrd: get MAC from flashMike Frysinger2011-04-08-12/+17
| | | | | | | | | | | | The MAC address is stored in the last flash sector rather than OTP. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: bf518f-ezbrd: get MAC from flashMike Frysinger2011-04-08-14/+17
| | | | | | | | | | | | The MAC address is stored in the last flash sector rather than OTP. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: bf548-ezkit: move env sectorMike Frysinger2011-04-08-1/+1
| | | | | | | | | | | | | | U-Boot itself takes up more than 0x40000 bytes, so we can't use that sector for the environment. Move it down a page. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: replace "bfin_reset_or_hang()" with "panic()"Kyle Moffett2011-04-08-19/+2
| | | | | | | | | | | | | | | | | | | | | | The bfin_reset_or_hang function unnecessarily duplicates the panic() logic based on CONFIG_PANIC_HANG. This patch deletes 20 lines of code and just calls panic() instead. This also makes the following generic-restart conversion patch simpler. Signed-off-by: Kyle Moffett <Kyle.D.Moffett@boeing.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: adi boards: enable CONFIG_MONITOR_IS_IN_RAMMike Frysinger2011-04-08-0/+2
| | | | | | | | | | | | Our monitor is always in RAM, so enable this define for the CFI layer. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: bfin_sdh: add support for multiblock operationsSonic Zhang2011-04-08-4/+5
| | | | | | | | | | | | | | Don't forget to count full data size for the multiblock operation request. Signed-off-by: Sonic Zhang <sonic.zhang@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: bfin_sdh: set all timer bits before transferCliff Cai2011-04-08-1/+1
| | | | | | | | | | | | | | | | The timer register is 32bits, not 16bit, so 0xFFFF won't fill it. Write out -1 to make sure to fill the whole thing. Signed-off-by: Cliff Cai <cliff.cai@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: adi boards: enable ldrinfoMike Frysinger2011-04-08-0/+1
| | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: ldrinfo: new commandMike Frysinger2011-04-08-0/+194
| | | | | | | | | | | | Simple command to decode/check an LDR image before we try to boot it. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: bootldr: use common definesMike Frysinger2011-04-08-13/+8
| | | | | | | | | | | | | | Now that the common bootrom.h sets up defines for us, switch to them rather than our own local set. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: bootrom.h: sync with toolchainMike Frysinger2011-04-08-27/+59
| | | | | | | | | | | | We need the updated LDR bit defines for our LDR utils. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: adi boards: drop old ELF defineMike Frysinger2011-04-08-1/+0
| | | | | | | | | | | | This define isn't used anywhere anymore, so punt it. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: bf506f-ezkit: new board portMike Frysinger2011-04-08-0/+185
| | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: default to L1 bank A when L1 bank B does not existMike Frysinger2011-04-08-3/+7
| | | | | | | | | | | | | | Some parts lack Bank B in L1 data, so have the linker script fall back to Bank A when that happens. This way we can still leverage L1 data. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: turn off caches when self initializingMike Frysinger2011-04-08-12/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When bootstrapping ourselves on the fly at runtime (via "go"), we need to turn off the caches to avoid taking software exceptions. Since caches need CPLBs and CPLBs need exception handlers, but we're about to rewrite the code in memory where those exception handlers live, we need to turn off caches first. This new code also encourages a slight code optimization by storing the MMR bases in dedicated registers so we don't have to fully load up the pointer regs multiple times. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: only check for os log when we have external memoryMike Frysinger2011-04-08-1/+1
| | | | | | | | | | | | | | | | If the part has no external memory configured, then there will be no os log for us to check, and any attempt to access that memory will trigger hardware errors. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: BF537: unify duplicated headersMike Frysinger2011-04-08-2446/+2419
| | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: BF52x: unify duplicated headersMike Frysinger2011-04-08-2068/+1481
| | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: drop duplicate system mmr and L1 scratch definesMike Frysinger2011-04-08-42/+1
| | | | | | | | | | | | | | Common code already takes care of setting up these defines when a port hasn't specified them, so punt the duplicate values. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: BF50x: new processor portMike Frysinger2011-04-08-18/+3196
| | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: fix bd_t handlingMike Frysinger2011-04-08-9/+6
| | | | | | | | | | | | | | | | | | The recent global data changes (making the size autogenerated) broke the board info handling on Blackfin ports as we were lying and lumping the bd_t size in with the gd_t size. So use the new dedicated bd_t size to setup its own address in memory. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: bf561-ezkit/ibf-dsp561: invert env offset/addr logicMike Frysinger2011-04-08-4/+4
| | | | | | | | | | | | | | | | Have CONFIG_ENV_ADDR be based on CONFIG_ENV_OFFSET rather than the other way around so that we can use CONFIG_ENV_OFFSET during build. It also avoids a little address duplication. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: bf537: fix L1 data definesMike Frysinger2011-04-08-1/+1
| | | | | | | | | | | | | | The __BFIN_DEF_ADSP_BF537_proc__ define isn't setup anymore, so use the one coming from the compiler. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: bf537-minotaur/bf537-srv1: undefine nfs when net is disabledMike Frysinger2011-04-08-0/+2
| | | | | | | | | | | | Fixes a build error due to new partial linking logic. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: serial: clean up muxing a bitMike Frysinger2011-04-08-31/+20
| | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: bf525-ucr2: new board portChong Huang2011-04-08-0/+178
| | | | | | | | | | | | Signed-off-by: Chong Huang <chuang@ucrobotics.com> Signed-off-by: Haitao Zhang <minipanda@linuxrobot.org> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: dnp5370: new board portAndreas Schallenberg2011-04-08-0/+358
| | | | | | | | | | | | | | | | Info about the hardware can be found here: http://www.dilnetpc.com/dnp0086.htm Signed-off-by: Andreas Schallenberg <Andreas.Schallenberg@3alitydigital.de> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: bf537-pnav/blackstamp/blackvme: drop empty config.mk filesMike Frysinger2011-04-08-74/+0
| | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: bf527-sdp: update custom CFLAGS pathsMike Frysinger2011-04-08-2/+2
| | | | | | | | | | | | Looks like the filesystem shuffling missed the SDP board. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: move CONFIG_BFIN_CPU back to board config.hMike Frysinger2011-04-08-59/+44
| | | | | | | | | | | | This is a revert of 821ad16fa9900c as Wolfgang doesn't like the new code. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: unify bootmode based LDR_FLAGS setupMike Frysinger2011-04-08-50/+5
| | | | | | | | | | | | Unify this convention for all Blackfin boards. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: drop CONFIG_SYS_TEXT_BASE from boardsMike Frysinger2011-04-08-84/+4
| | | | | | | | | | | | | | We don't want/use this value for Blackfin boards, so punt it and have the common code error out when people try to use it. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: skip RAM display for 0 mem systemsMike Frysinger2011-04-08-2/+5
| | | | | | | | Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| * Blackfin: bf518f-ezbrd: don't require SPI logic all the timeMike Frysinger2011-04-08-9/+21
| | | | | | | | | | | | | | Only the first run of boards had a ksz switch on it, so if building for a newer silicon rev or SPI is disabled, don't bother checking for the ksz. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
* | mtd, cfi: introduce void flash_protect_default(void)Heiko Schocher2011-04-07-36/+42
| | | | | | | | | | | | | | | | collect code which protects default sectors in a function, called flash_protect_default. So boardspecific code can call it too. Signed-off-by: Heiko Schocher <hs@denx.de> Signed-off-by: Stefan Roese <sr@denx.de>
* | cfi_flash: use AMD fixups for AMIC (e.g. A29L160A series) tooMario Schuknecht2011-04-07-1/+2
|/ | | | | | Signed-off-by: Mario Schuknecht <m.schuknecht@dresearch.de> Signed-off-by: Steffen Sledz <sledz@dresearch.de> Signed-off-by: Stefan Roese <sr@denx.de>
* Merge branch 'master' of git://git.denx.de/u-boot-mpc85xxWolfgang Denk2011-04-05-1262/+2394
|\ | | | | | | | | | | | | Conflicts: drivers/usb/host/ehci-pci.c Signed-off-by: Wolfgang Denk <wd@denx.de>
| * powerpc: clean up DIU macro definitions for Freescale reference boardsTimur Tabi2011-04-04-16/+31
| | | | | | | | | | | | | | | | | | | | | | | | Clean up the macro defintions used to enable DIU (video) support on the MPC8610HPCD and the MPC5121ADS so that they look more like the P1022DS, which is newer. Add software cursor support to all three boards. Also document the CONFIG_FSL_DIU_FB in the README. Signed-off-by: Timur Tabi <timur@freescale.com> Acked-by: Anatolij Gustschin <agust@denx.de> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * powerpc/85xx: Enable eSDHC boot support on P2020 DSJerry Huang2011-04-04-1/+103
| | | | | | | | | | | | | | | | | | | | | | We implement our own mmc_get_env_addr since the environment variables are written to just after the u-boot image on SDCard, so we must read the MBR to get the start address and code length of the u-boot image, then calculate the address of the env. Signed-off-by: Jerry Huang <Chang-Ming.Huang@freescale.com> Signed-off-by: Zhao Chenhui <b35336@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * env_mmc: Allow board code to override the environment addressMingkai Hu2011-04-04-4/+27
| | | | | | | | | | | | | | | | | | | | | | | | On some boards the environment may not be located at a fixed address in the MMC/SDHC card. This allows those boards to implement their own means to report what address the environment is located at. Signed-off-by: Mingkai Hu <Mingkai.hu@freescale.com> Signed-off-by: Jerry Huang <Chang-Ming.Huang@freescale.com> Signed-off-by: Zhao Chenhui <b35336@freescale.com> Acked-by: Andy Fleming <afleming@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * powerpc/8xxx: Fix typo for address hashing messageKumar Gala2011-04-04-1/+1
| | | | | | | | Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * mpc8xxx: DDR2/DDR3: Clean up DIMM-type switch statementsKyle Moffett2011-04-04-43/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The numeric constants in the switch statements are replaced by #defines added to the common ddr_spd.h header. This dramatically improves the readability of the switch statments. In addition, a few of the longer lines were cleaned up, and the DDR2 type for an SO-RDIMM module was added to the DDR2 switch statement. Signed-off-by: Kyle Moffett <Kyle.D.Moffett@boeing.com> Cc: Andy Fleming <afleming@gmail.com> Cc: Kim Phillips <kim.phillips@freescale.com> Acked-by: York Sun <yorksun@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * fsl_ddr: Don't use full 64-bit divides on 32-bit PowerPCKyle Moffett2011-04-04-16/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current FreeScale MPC-8xxx DDR SPD interpreter is using full 64-bit integer divide operations to convert between nanoseconds and DDR clock cycles given arbitrary DDR clock frequencies. Since all of the inputs to this are 32-bit (nanoseconds, clock cycles, and DDR frequencies), we can easily restructure the computation to use the "do_div()" function to perform 64-bit/32-bit divide operations. On 64-bit this change is basically a no-op, because do_div is implemented as a literal 64-bit divide operation and the instruction scheduling works out almost the same. On 32-bit PowerPC a fully accurate 64/64 divide (__udivdi3 in libgcc) is over 1.1kB of code and thousands of heavily dependent cycles to compute, all of which is linked from libgcc. Another 1.2kB of code comes in for the function __umoddi3. It should be noted that nothing else in U-Boot or the Linux kernel seems to require a full 64-bit divide on my 32-bit PowerPC. Build-and-boot-tested on the HWW-1U-1A board using DDR2 SPD detection. Signed-off-by: Kyle Moffett <Kyle.D.Moffett@boeing.com> Acked-by: York Sun <yorksun@freescale.com> Cc: Andy Fleming <afleming@gmail.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * powerpc/85xx: Fix setting of LIODN prop in PCIe nodes on P3041/P5020Laurentiu TUDOR2011-04-04-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | We utilize the compatible string to find the node to add fsl,liodn property to. However P3041 & P5020 don't have "fsl,p4080-pcie" compatible for their PCIe controllers as they aren't backwards compatible. Allow the macro's to specify the PCIe compatible to use to allow SoC uniqueness. On P3041 & P5020 we utilize "fsl,qoriq-pcie-v2.2" for the PCIe controllers. Signed-off-by: Laurentiu TUDOR <Laurentiu.Tudor@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * powerpc/85xx: Add 36-bit address map support to P1022DSJiang Yutang2011-04-04-1/+49
| | | | | | | | | | Signed-off-by: Jiang Yutang <b14898@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * tsec: add AR8021 PHY supportLi Yang2011-04-04-0/+23
| | | | | | | | Signed-off-by: Li Yang <leoli@freescale.com>
| * powerpc/85xx: Update timer-frequency prop in ptp_timer node of device treebhaskar upadhaya2011-04-04-0/+9
| | | | | | | | | | | | | | | | | | | | Fix up the device tree property associated with the IEEE 1588 timer source frequency. Currently we only support the IEEE 1588 timer source being the internal eTSEC system clock (for those SoCs with IEEE 1588 support). The eTSEC clock is ccb_clk/2. Signed-off-by: Bhaskar Upadhaya <Bhaskar.Upadhaya@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * powerpc/85xx: Fix determining Fman freq on P1023Kumar Gala2011-04-04-4/+1
| | | | | | | | | | | | | | | | On the P1023 the Fman freq is equivalent to the system bus freq, not 1/2 of it. Also we only have one Fman so no need for the code to deal with a second. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * powerpc/85xx: Fixup determining PME, FMan freqKumar Gala2011-04-04-9/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On CoreNet based SoCs (P2040, P3041, P4080, P5020) we have some additional rules to determining the various frequencies that PME & FMan IP blocks run at. We need to take into account: * Reduced number of Core Complex PLL clusters * HWA_ASYNC_DIV (allows for /2 or /4 options) On P2040/P3041/P5020 we only have 2 Core Complex PLLs and in such SoCs the PME & FMan blocks utilize the second Core Complex PLL. On SoCs like p4080 with 4 Core Complex PLLs we utilize the third Core Complex PLL for PME & FMan blocks. On P2040/P3041/P5020 we have the added feature that we can divide the PLL down further by either /2 or /4 based on HWA_ASYNC_DIV. On P4080 this options doesn't exist, however HWA_ASYNC_DIV field in RCW should be set to 0 and this gets a backward compatiable /2 behavior. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>