[1/4] pflash: Remove ast.h

pflash contained a copy of the include/ast.h header. It had grown stale,
so remove in and link in the common header.

Note that it's hard to test that we haven't broken tools in the
external/ directory these days; when making changes we need to test with
amd64, ppc64, ppc64le and arm to ensure that everything can build!

Signed-off-by: Joel Stanley <joel@jms.id.au>
---
 external/common/rules.mk |  1 +
 external/pflash/ast.h    | 67 ------------------------------------------------
 2 files changed, 1 insertion(+), 67 deletions(-)
 delete mode 100644 external/pflash/ast.h

On 11/25/2015 06:42 AM, Joel Stanley wrote:
> pflash contained a copy of the include/ast.h header. It had grown stale,
> so remove in and link in the common header.
> 
> Note that it's hard to test that we haven't broken tools in the
> external/ directory these days; when making changes we need to test with
> amd64, ppc64, ppc64le and arm to ensure that everything can build!

You could use a armel schroot. It is fast enough to compile pflash on my 
laptop.

For all patches : 

	Reviewed-by: Cédric Le Goater <clg@fr.ibm.com>

I gave them a try on a Habanero system which has the same flash module. 
Looks good.

Thanks,

C. 

> Signed-off-by: Joel Stanley <joel@jms.id.au>
> ---
>  external/common/rules.mk |  1 +
>  external/pflash/ast.h    | 67 ------------------------------------------------
>  2 files changed, 1 insertion(+), 67 deletions(-)
>  delete mode 100644 external/pflash/ast.h
> 
> diff --git a/external/common/rules.mk b/external/common/rules.mk
> index 3ae9181db20e..7ebf48531e19 100644
> --- a/external/common/rules.mk
> +++ b/external/common/rules.mk
> @@ -20,6 +20,7 @@ endif
>  .PHONY: arch_links
>  arch_links:
>  	ln -sf ../../hw/ast-bmc/ast-sf-ctrl.c common/ast-sf-ctrl.c
> +	ln -sf ../../include/ast.h common/ast.h
>  	ln -sf arch_flash_$(arch)_io.h common/io.h
>  
>  .PHONY: arch_clean
> diff --git a/external/pflash/ast.h b/external/pflash/ast.h
> deleted file mode 100644
> index 1910eb49ff18..000000000000
> --- a/external/pflash/ast.h
> +++ /dev/null
> @@ -1,67 +0,0 @@
> -#ifndef __AST_H
> -#define __AST_H
> -
> -/*
> - * AHB bus registers
> - */
> -
> -/* SPI Flash controller #1 (BMC) */
> -#define BMC_SPI_FCTL_BASE	0x1E620000
> -#define BMC_SPI_FCTL_CTRL	(BMC_SPI_FCTL_BASE + 0x10)
> -#define BMC_SPI_FREAD_TIMING	(BMC_SPI_FCTL_BASE + 0x94)
> -#define BMC_FLASH_BASE		0x20000000
> -
> -/* SPI Flash controller #2 (PNOR) */
> -#define PNOR_SPI_FCTL_BASE	0x1E630000
> -#define PNOR_SPI_FCTL_CONF	(PNOR_SPI_FCTL_BASE + 0x00)
> -#define PNOR_SPI_FCTL_CTRL	(PNOR_SPI_FCTL_BASE + 0x04)
> -#define PNOR_SPI_FREAD_TIMING	(PNOR_SPI_FCTL_BASE + 0x14)
> -#define PNOR_FLASH_BASE		0x30000000
> -
> -/* LPC registers */
> -#define LPC_BASE		0x1e789000
> -#define LPC_HICR6		(LPC_BASE + 0x80)
> -#define LPC_HICR7		(LPC_BASE + 0x88)
> -#define LPC_HICR8		(LPC_BASE + 0x8c)
> -
> -/* SCU registers */
> -#define SCU_BASE		0x1e6e2000
> -#define SCU_HW_STRAPPING	(SCU_BASE + 0x70)
> -
> -/*
> - * AHB Accessors
> - */
> -#ifndef __SKIBOOT__
> -#include "common/io.h"
> -#else
> -
> -/*
> - * Register accessors, return byteswapped values
> - * (IE. LE registers)
> - */
> -void ast_ahb_writel(uint32_t val, uint32_t reg);
> -uint32_t ast_ahb_readl(uint32_t reg);
> -
> -/*
> - * copy to/from accessors. Cannot cross IDSEL boundaries (256M)
> - */
> -int ast_copy_to_ahb(uint32_t reg, const void *src, uint32_t len);
> -int ast_copy_from_ahb(void *dst, uint32_t reg, uint32_t len);
> -
> -void ast_io_init(void);
> -
> -#endif /* __SKIBOOT__ */
> -
> -/*
> - * SPI Flash controllers
> - */
> -#define AST_SF_TYPE_PNOR	0
> -#define AST_SF_TYPE_BMC		1
> -#define AST_SF_TYPE_MEM 	2
> -
> -struct spi_flash_ctrl;
> -int ast_sf_open(uint8_t type, struct spi_flash_ctrl **ctrl);
> -void ast_sf_close(struct spi_flash_ctrl *ctrl);
> -
> -
> -#endif /* __AST_H */
>

On Thu, Nov 26, 2015 at 4:32 AM, Cédric Le Goater <clg@fr.ibm.com> wrote:

>> Note that it's hard to test that we haven't broken tools in the
>> external/ directory these days; when making changes we need to test with
>> amd64, ppc64, ppc64le and arm to ensure that everything can build!
>
> You could use a armel schroot. It is fast enough to compile pflash on my
> laptop.

Yeah, that's another way to do it. I've been using the Ubuntu cross compilers.

I sent in a script that sets CROSS_COMPILE for each of the
architectures in turn and builds pflash. I'll get jenkins building
this for us, which should help catch issues.

> For all patches :
>
>         Reviewed-by: Cédric Le Goater <clg@fr.ibm.com>
>
> I gave them a try on a Habanero system which has the same flash module.
> Looks good.

Thanks for the review and test!

Cheers,

Joel

Joel Stanley <joel@jms.id.au> writes:
> pflash contained a copy of the include/ast.h header. It had grown stale,
> so remove in and link in the common header.
>
> Note that it's hard to test that we haven't broken tools in the
> external/ directory these days; when making changes we need to test with
> amd64, ppc64, ppc64le and arm to ensure that everything can build!
>
> Signed-off-by: Joel Stanley <joel@jms.id.au>
> ---
>  external/common/rules.mk |  1 +
>  external/pflash/ast.h    | 67 ------------------------------------------------
>  2 files changed, 1 insertion(+), 67 deletions(-)
>  delete mode 100644 external/pflash/ast.h
>

Thanks, series merged as of 71c2d6b72be7213914e2708c884b45fa74f525e6