Skip to content
Snippets Groups Projects
  • Masahiro Yamada's avatar
    58dac327
    powerpc: mpc8260: consolidate CONFIG_MPC8260 and CONFIG_8260 · 58dac327
    Masahiro Yamada authored
    
    Before this commit, CONFIG_MPC8260 and CONFIG_8260
    were used mixed-up.
    
    All boards with mpc8260 cpu defined both of them:
      - CONFIG_MPC8260 was defined in board config headers
          and include/common.h
      - CONFIG_8260 was defined arch/powerpc/cpu/mpc8260/config.mk
    
    We do not need to have both of them.
    This commit keeps only CONFIG_MPC8260.
    
    This commit does:
     - Delete CONFIG_8260 and CONFIG_MPC8260 definition
       in config headers and include/common.h
     - Rename CONFIG_8260 to CONFIG_MPC8260
        in arch/powerpc/cpu/mpc8260/config.mk.
     - Rename #ifdef CONFIG_8260 to #ifdef CONFIG_MPC8260
    
    Signed-off-by: default avatarMasahiro Yamada <yamada.m@jp.panasonic.com>
    Cc: Wolfgang Denk <wd@denx.de>
    58dac327
    History
    powerpc: mpc8260: consolidate CONFIG_MPC8260 and CONFIG_8260
    Masahiro Yamada authored
    
    Before this commit, CONFIG_MPC8260 and CONFIG_8260
    were used mixed-up.
    
    All boards with mpc8260 cpu defined both of them:
      - CONFIG_MPC8260 was defined in board config headers
          and include/common.h
      - CONFIG_8260 was defined arch/powerpc/cpu/mpc8260/config.mk
    
    We do not need to have both of them.
    This commit keeps only CONFIG_MPC8260.
    
    This commit does:
     - Delete CONFIG_8260 and CONFIG_MPC8260 definition
       in config headers and include/common.h
     - Rename CONFIG_8260 to CONFIG_MPC8260
        in arch/powerpc/cpu/mpc8260/config.mk.
     - Rename #ifdef CONFIG_8260 to #ifdef CONFIG_MPC8260
    
    Signed-off-by: default avatarMasahiro Yamada <yamada.m@jp.panasonic.com>
    Cc: Wolfgang Denk <wd@denx.de>
api_platform-powerpc.c 1.34 KiB
/*
 * (C) Copyright 2007 Semihalf
 *
 * Written by: Rafal Jaworowski <raj@semihalf.com>
 *
 * SPDX-License-Identifier:	GPL-2.0+
 *
 * This file contains routines that fetch data from PowerPC-dependent sources
 * (bd_info etc.)
 */

#include <config.h>
#include <linux/types.h>
#include <api_public.h>

#include <asm/u-boot.h>
#include <asm/global_data.h>

#include "api_private.h"

DECLARE_GLOBAL_DATA_PTR;

/*
 * Important notice: handling of individual fields MUST be kept in sync with
 * include/asm-ppc/u-boot.h and include/asm-ppc/global_data.h, so any changes
 * need to reflect their current state and layout of structures involved!
 */
int platform_sys_info(struct sys_info *si)
{
	si->clk_bus = gd->bus_clk;
	si->clk_cpu = gd->cpu_clk;

#if defined(CONFIG_5xx) || defined(CONFIG_8xx) || defined(CONFIG_MPC8260) || \
    defined(CONFIG_E500) || defined(CONFIG_MPC86xx)
#define bi_bar	bi_immr_base
#elif defined(CONFIG_MPC5xxx)
#define bi_bar	bi_mbar_base
#elif defined(CONFIG_MPC83xx)
#define bi_bar	bi_immrbar
#endif

#if defined(bi_bar)
	si->bar = gd->bd->bi_bar;
#undef bi_bar
#else
	si->bar = 0;
#endif

	platform_set_mr(si, gd->bd->bi_memstart, gd->bd->bi_memsize, MR_ATTR_DRAM);
	platform_set_mr(si, gd->bd->bi_flashstart, gd->bd->bi_flashsize, MR_ATTR_FLASH);
	platform_set_mr(si, gd->bd->bi_sramstart, gd->bd->bi_sramsize, MR_ATTR_SRAM);

	return 1;
}