imx: Don't define __ASSEMBLY__ in source files

This is supposed to be a build-system flag. Move it there so we can
define it before linux/kconfig.h is included.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2022-01-22 05:07:22 -07:00 committed by Tom Rini
parent 531c008945
commit 5c86a8f7a1
66 changed files with 1 additions and 68 deletions

View File

@ -91,7 +91,7 @@ $(PLUGIN).bin:
endif endif
quiet_cmd_cpp_cfg = CFGS $@ quiet_cmd_cpp_cfg = CFGS $@
cmd_cpp_cfg = $(CPP) $(cpp_flags) -x c -o $@ $< cmd_cpp_cfg = $(CPP) $(cpp_flags) -D__ASSEMBLY__ -x c -o $@ $<
# mkimage source config file # mkimage source config file
IMX_CONFIG = $(CONFIG_IMX_CONFIG:"%"=%) IMX_CONFIG = $(CONFIG_IMX_CONFIG:"%"=%)

View File

@ -3,7 +3,6 @@
* Copyright 2019 NXP * Copyright 2019 NXP
*/ */
#define __ASSEMBLY__
FIT FIT
BOOT_FROM sd BOOT_FROM sd

View File

@ -3,7 +3,6 @@
* Copyright 2019 NXP * Copyright 2019 NXP
*/ */
#define __ASSEMBLY__
FIT FIT
ROM_VERSION v2 ROM_VERSION v2

View File

@ -3,7 +3,6 @@
* Copyright 2019 NXP * Copyright 2019 NXP
*/ */
#define __ASSEMBLY__
FIT FIT
ROM_VERSION v2 ROM_VERSION v2

View File

@ -3,7 +3,6 @@
* Copyright 2019 NXP * Copyright 2019 NXP
*/ */
#define __ASSEMBLY__
FIT FIT
ROM_VERSION v2 ROM_VERSION v2

View File

@ -3,7 +3,6 @@
* Copyright 2018-2021 NXP * Copyright 2018-2021 NXP
*/ */
#define __ASSEMBLY__
FIT FIT
BOOT_FROM sd BOOT_FROM sd

View File

@ -3,7 +3,6 @@
* Copyright (C) 2014, Compulab Ltd - http://compulab.co.il/ * Copyright (C) 2014, Compulab Ltd - http://compulab.co.il/
*/ */
#define __ASSEMBLY__
#include <config.h> #include <config.h>
IMAGE_VERSION 2 IMAGE_VERSION 2

View File

@ -3,7 +3,6 @@
* Copyright (C) 2014, Compulab Ltd - http://compulab.co.il/ * Copyright (C) 2014, Compulab Ltd - http://compulab.co.il/
*/ */
#define __ASSEMBLY__
#include <config.h> #include <config.h>
IMAGE_VERSION 2 IMAGE_VERSION 2

View File

@ -3,7 +3,6 @@
* Copyright 2018 NXP * Copyright 2018 NXP
*/ */
#define __ASSEMBLY__
/* Boot from SD, sector size 0x400 */ /* Boot from SD, sector size 0x400 */
BOOT_FROM SD 0x400 BOOT_FROM SD 0x400

View File

@ -21,7 +21,6 @@ IMAGE_VERSION 2
*/ */
BOOT_FROM spi BOOT_FROM spi
#define __ASSEMBLY__
#include <config.h> #include <config.h>
#ifdef CONFIG_IMX_HAB #ifdef CONFIG_IMX_HAB
CSF CONFIG_CSF_SIZE CSF CONFIG_CSF_SIZE

View File

@ -3,7 +3,6 @@
* Copyright 2021 NXP * Copyright 2021 NXP
*/ */
#define __ASSEMBLY__
BOOT_FROM sd BOOT_FROM sd
LOADER u-boot-spl-ddr.bin 0x7E1000 LOADER u-boot-spl-ddr.bin 0x7E1000

View File

@ -3,7 +3,6 @@
* Copyright 2021 NXP * Copyright 2021 NXP
*/ */
#define __ASSEMBLY__
ROM_VERSION v2 ROM_VERSION v2
BOOT_FROM sd BOOT_FROM sd

View File

@ -17,7 +17,6 @@ IMAGE_VERSION 2
*/ */
BOOT_FROM spi BOOT_FROM spi
#define __ASSEMBLY__
#include <config.h> #include <config.h>
#ifdef CONFIG_IMX_HAB #ifdef CONFIG_IMX_HAB
CSF CONFIG_CSF_SIZE CSF CONFIG_CSF_SIZE

View File

@ -17,7 +17,6 @@ IMAGE_VERSION 2
*/ */
BOOT_FROM spi BOOT_FROM spi
#define __ASSEMBLY__
#include <config.h> #include <config.h>
#ifdef CONFIG_IMX_HAB #ifdef CONFIG_IMX_HAB
CSF CONFIG_CSF_SIZE CSF CONFIG_CSF_SIZE

View File

@ -17,7 +17,6 @@ IMAGE_VERSION 2
*/ */
BOOT_FROM spi BOOT_FROM spi
#define __ASSEMBLY__
#include <config.h> #include <config.h>
#ifdef CONFIG_IMX_HAB #ifdef CONFIG_IMX_HAB
CSF CONFIG_CSF_SIZE CSF CONFIG_CSF_SIZE

View File

@ -17,7 +17,6 @@ IMAGE_VERSION 2
*/ */
BOOT_FROM spi BOOT_FROM spi
#define __ASSEMBLY__
#include <config.h> #include <config.h>
#ifdef CONFIG_IMX_HAB #ifdef CONFIG_IMX_HAB
CSF CONFIG_CSF_SIZE CSF CONFIG_CSF_SIZE

View File

@ -17,7 +17,6 @@ IMAGE_VERSION 2
*/ */
BOOT_FROM spi BOOT_FROM spi
#define __ASSEMBLY__
#include <config.h> #include <config.h>
#ifdef CONFIG_IMX_HAB #ifdef CONFIG_IMX_HAB
CSF CONFIG_CSF_SIZE CSF CONFIG_CSF_SIZE

View File

@ -17,7 +17,6 @@ IMAGE_VERSION 2
*/ */
BOOT_FROM spi BOOT_FROM spi
#define __ASSEMBLY__
#include <config.h> #include <config.h>
#ifdef CONFIG_IMX_HAB #ifdef CONFIG_IMX_HAB
CSF CONFIG_CSF_SIZE CSF CONFIG_CSF_SIZE

View File

@ -3,7 +3,6 @@
* Copyright 2021 NXP * Copyright 2021 NXP
*/ */
#define __ASSEMBLY__
BOOT_FROM sd BOOT_FROM sd
LOADER u-boot-spl-ddr.bin 0x7e1000 LOADER u-boot-spl-ddr.bin 0x7e1000

View File

@ -3,7 +3,6 @@
* Copyright 2018 NXP * Copyright 2018 NXP
*/ */
#define __ASSEMBLY__
/* Boot from SD, sector size 0x400 */ /* Boot from SD, sector size 0x400 */
BOOT_FROM SD 0x400 BOOT_FROM SD 0x400

View File

@ -9,7 +9,6 @@
* The syntax is taken as close as possible with the kwbimage * The syntax is taken as close as possible with the kwbimage
*/ */
#define __ASSEMBLY__
#include <config.h> #include <config.h>
/* image version */ /* image version */

View File

@ -3,7 +3,6 @@
* Copyright 2021 NXP * Copyright 2021 NXP
*/ */
#define __ASSEMBLY__
BOOT_FROM sd BOOT_FROM sd
LOADER u-boot-spl-ddr.bin 0x7E1000 LOADER u-boot-spl-ddr.bin 0x7E1000

View File

@ -3,7 +3,6 @@
* Copyright 2021 NXP * Copyright 2021 NXP
*/ */
#define __ASSEMBLY__
ROM_VERSION v2 ROM_VERSION v2
BOOT_FROM sd BOOT_FROM sd

View File

@ -3,7 +3,6 @@
* Copyright 2021 NXP * Copyright 2021 NXP
*/ */
#define __ASSEMBLY__
ROM_VERSION v2 ROM_VERSION v2
BOOT_FROM sd BOOT_FROM sd

View File

@ -3,7 +3,6 @@
* Copyright 2018 NXP * Copyright 2018 NXP
*/ */
#define __ASSEMBLY__
/* Boot from SD, sector size 0x400 */ /* Boot from SD, sector size 0x400 */
BOOT_FROM SD 0x400 BOOT_FROM SD 0x400

View File

@ -3,7 +3,6 @@
* Copyright 2019 NXP * Copyright 2019 NXP
*/ */
#define __ASSEMBLY__
/* This file is to create a container image could be loaded by SPL */ /* This file is to create a container image could be loaded by SPL */
BOOT_FROM SD 0x400 BOOT_FROM SD 0x400

View File

@ -6,7 +6,6 @@
* and create imx8image boot image * and create imx8image boot image
*/ */
#define __ASSEMBLY__
/* Boot from SD, sector size 0x400 */ /* Boot from SD, sector size 0x400 */
BOOT_FROM SD 0x400 BOOT_FROM SD 0x400

View File

@ -3,7 +3,6 @@
* Copyright 2019 NXP * Copyright 2019 NXP
*/ */
#define __ASSEMBLY__
/* This file is to create a container image could be loaded by SPL */ /* This file is to create a container image could be loaded by SPL */
BOOT_FROM SD 0x400 BOOT_FROM SD 0x400

View File

@ -4,7 +4,6 @@
* Author(s): Giulio Benetti <giulio.benetti@benettiengineering.com> * Author(s): Giulio Benetti <giulio.benetti@benettiengineering.com>
*/ */
#define __ASSEMBLY__
#include <config.h> #include <config.h>
/* image version */ /* image version */

View File

@ -4,7 +4,6 @@
* Author(s): Giulio Benetti <giulio.benetti@benettiengineering.com> * Author(s): Giulio Benetti <giulio.benetti@benettiengineering.com>
*/ */
#define __ASSEMBLY__
#include <config.h> #include <config.h>
/* image version */ /* image version */

View File

@ -7,7 +7,6 @@
* *
* The syntax is taken as close as possible with the kwbimage * The syntax is taken as close as possible with the kwbimage
*/ */
#define __ASSEMBLY__
#include <config.h> #include <config.h>
/* image version */ /* image version */

View File

@ -8,7 +8,6 @@
* The syntax is taken as close as possible with the kwbimage * The syntax is taken as close as possible with the kwbimage
*/ */
#define __ASSEMBLY__
#include <config.h> #include <config.h>
/* image version */ /* image version */

View File

@ -3,7 +3,6 @@
* Copyright (C) 2014 Freescale Semiconductor, Inc. * Copyright (C) 2014 Freescale Semiconductor, Inc.
*/ */
#define __ASSEMBLY__
#include <config.h> #include <config.h>
/* image version */ /* image version */

View File

@ -3,7 +3,6 @@
* Copyright (C) 2014 Freescale Semiconductor, Inc. * Copyright (C) 2014 Freescale Semiconductor, Inc.
*/ */
#define __ASSEMBLY__
#include <config.h> #include <config.h>
/* image version */ /* image version */

View File

@ -8,7 +8,6 @@
* The syntax is taken as close as possible with the kwbimage * The syntax is taken as close as possible with the kwbimage
*/ */
#define __ASSEMBLY__
#include <config.h> #include <config.h>
/* image version */ /* image version */

View File

@ -8,7 +8,6 @@
* The syntax is taken as close as possible with the kwbimage * The syntax is taken as close as possible with the kwbimage
*/ */
#define __ASSEMBLY__
#include <config.h> #include <config.h>
/* image version */ /* image version */

View File

@ -8,7 +8,6 @@
* The syntax is taken as close as possible with the kwbimage * The syntax is taken as close as possible with the kwbimage
*/ */
#define __ASSEMBLY__
#include <config.h> #include <config.h>
/* image version */ /* image version */

View File

@ -3,7 +3,6 @@
* Copyright 2021 Gateworks Corporation * Copyright 2021 Gateworks Corporation
*/ */
#define __ASSEMBLY__
BOOT_FROM sd BOOT_FROM sd
LOADER u-boot-spl-ddr.bin 0x7E1000 LOADER u-boot-spl-ddr.bin 0x7E1000

View File

@ -13,7 +13,6 @@
IMAGE_VERSION 2 IMAGE_VERSION 2
BOOT_FROM sd BOOT_FROM sd
#define __ASSEMBLY__
#include <config.h> #include <config.h>
#include "asm/arch/mx6-ddr.h" #include "asm/arch/mx6-ddr.h"
#include "asm/arch/iomux.h" #include "asm/arch/iomux.h"

View File

@ -3,7 +3,6 @@
* Copyright (C) 2019 Kontron Electronics GmbH * Copyright (C) 2019 Kontron Electronics GmbH
*/ */
#define __ASSEMBLY__
BOOT_FROM sd BOOT_FROM sd
LOADER u-boot-spl-ddr.bin 0x7E1000 LOADER u-boot-spl-ddr.bin 0x7E1000

View File

@ -9,7 +9,6 @@
* The syntax is taken as close as possible with the kwbimage * The syntax is taken as close as possible with the kwbimage
*/ */
#define __ASSEMBLY__
#include <config.h> #include <config.h>
/* image version */ /* image version */

View File

@ -2,7 +2,6 @@
// Copyright (C) 2016 Freescale Semiconductor, Inc. // Copyright (C) 2016 Freescale Semiconductor, Inc.
// Copyright (C) 2021 Oleh Kravchenko <oleg@kaa.org.ua> // Copyright (C) 2021 Oleh Kravchenko <oleg@kaa.org.ua>
#define __ASSEMBLY__
#include <config.h> #include <config.h>
/* image version */ /* image version */

View File

@ -2,7 +2,6 @@
// Copyright (C) 2016 Freescale Semiconductor, Inc. // Copyright (C) 2016 Freescale Semiconductor, Inc.
// Copyright (C) 2021 Oleh Kravchenko <oleg@kaa.org.ua> // Copyright (C) 2021 Oleh Kravchenko <oleg@kaa.org.ua>
#define __ASSEMBLY__
#include <config.h> #include <config.h>
/* image version */ /* image version */

View File

@ -3,7 +3,6 @@
* Copyright 2021 Phytec Messtechnik GmbH * Copyright 2021 Phytec Messtechnik GmbH
*/ */
#define __ASSEMBLY__
BOOT_FROM sd BOOT_FROM sd
LOADER u-boot-spl-ddr.bin 0x7E1000 LOADER u-boot-spl-ddr.bin 0x7E1000

View File

@ -3,7 +3,6 @@
* Copyright 2021 NXP * Copyright 2021 NXP
*/ */
#define __ASSEMBLY__
ROM_VERSION v2 ROM_VERSION v2
BOOT_FROM sd BOOT_FROM sd

View File

@ -3,7 +3,6 @@
* Copyright 2021 NXP * Copyright 2021 NXP
*/ */
#define __ASSEMBLY__
BOOT_FROM sd BOOT_FROM sd
LOADER mkimage.flash.mkimage 0x7E1000 LOADER mkimage.flash.mkimage 0x7E1000

View File

@ -6,7 +6,6 @@
* and create imx8image boot image * and create imx8image boot image
*/ */
#define __ASSEMBLY__
/* Boot from SD, sector size 0x400 */ /* Boot from SD, sector size 0x400 */
BOOT_FROM SD 0x400 BOOT_FROM SD 0x400

View File

@ -3,7 +3,6 @@
* Copyright 2019 NXP * Copyright 2019 NXP
*/ */
#define __ASSEMBLY__
/* This file is to create a container image could be loaded by SPL */ /* This file is to create a container image could be loaded by SPL */
BOOT_FROM SD 0x400 BOOT_FROM SD 0x400

View File

@ -4,7 +4,6 @@
* Copyright (C) 2017-2019 softing automotive electronics gmbH * Copyright (C) 2017-2019 softing automotive electronics gmbH
*/ */
#define __ASSEMBLY__
#include <config.h> #include <config.h>
/* image version */ /* image version */

View File

@ -9,7 +9,6 @@
* The syntax is taken as close as possible with the kwbimage * The syntax is taken as close as possible with the kwbimage
*/ */
#define __ASSEMBLY__
#include <config.h> #include <config.h>
/* image version */ /* image version */

View File

@ -8,7 +8,6 @@
* The syntax is taken as close as possible with the kwbimage * The syntax is taken as close as possible with the kwbimage
*/ */
#define __ASSEMBLY__
#include <config.h> #include <config.h>
IMAGE_VERSION 2 IMAGE_VERSION 2

View File

@ -3,7 +3,6 @@
* Copyright (C) 2017 Soeren Moch <smoch@web.de> * Copyright (C) 2017 Soeren Moch <smoch@web.de>
*/ */
#define __ASSEMBLY__
#include "asm/arch/crm_regs.h" #include "asm/arch/crm_regs.h"
#include "asm/arch/iomux.h" #include "asm/arch/iomux.h"
#include "asm/arch/mx6-ddr.h" #include "asm/arch/mx6-ddr.h"

View File

@ -8,7 +8,6 @@
* The syntax is taken as close as possible with the kwbimage * The syntax is taken as close as possible with the kwbimage
*/ */
#define __ASSEMBLY__
#include <config.h> #include <config.h>
/* image version */ /* image version */

View File

@ -6,7 +6,6 @@
* and create imx8image boot image * and create imx8image boot image
*/ */
#define __ASSEMBLY__
/* Boot from SD, sector size 0x400 */ /* Boot from SD, sector size 0x400 */
BOOT_FROM EMMC_FASTBOOT 0x400 BOOT_FROM EMMC_FASTBOOT 0x400

View File

@ -6,7 +6,6 @@
* and create imx8image boot image * and create imx8image boot image
*/ */
#define __ASSEMBLY__
/* Boot from SD, sector size 0x400 */ /* Boot from SD, sector size 0x400 */
BOOT_FROM EMMC_FASTBOOT 0x400 BOOT_FROM EMMC_FASTBOOT 0x400

View File

@ -9,7 +9,6 @@
* The syntax is taken as close as possible with the kwbimage * The syntax is taken as close as possible with the kwbimage
*/ */
#define __ASSEMBLY__
#include <config.h> #include <config.h>
/* image version */ /* image version */

View File

@ -6,7 +6,6 @@
* and create imx8image boot image * and create imx8image boot image
*/ */
#define __ASSEMBLY__
/* Boot from SD, sector size 0x400 */ /* Boot from SD, sector size 0x400 */
BOOT_FROM EMMC_FASTBOOT 0x400 BOOT_FROM EMMC_FASTBOOT 0x400

View File

@ -9,7 +9,6 @@
* The syntax is taken as close as possible with the kwbimage * The syntax is taken as close as possible with the kwbimage
*/ */
#define __ASSEMBLY__
#include <config.h> #include <config.h>
/* image version */ /* image version */

View File

@ -3,7 +3,6 @@
* Copyright 2020-2021 Toradex * Copyright 2020-2021 Toradex
*/ */
#define __ASSEMBLY__
BOOT_FROM emmc_fastboot BOOT_FROM emmc_fastboot
LOADER u-boot-spl-ddr.bin 0x7e1000 LOADER u-boot-spl-ddr.bin 0x7e1000

View File

@ -3,8 +3,6 @@
* Copyright 2022 Toradex * Copyright 2022 Toradex
*/ */
#define __ASSEMBLY__
ROM_VERSION v2 ROM_VERSION v2
BOOT_FROM emmc_fastboot BOOT_FROM emmc_fastboot
LOADER u-boot-spl-ddr.bin 0x920000 LOADER u-boot-spl-ddr.bin 0x920000

View File

@ -11,7 +11,6 @@
/* image version */ /* image version */
IMAGE_VERSION 2 IMAGE_VERSION 2
#define __ASSEMBLY__
#include <config.h> #include <config.h>
/* /*

View File

@ -11,7 +11,6 @@
/* image version */ /* image version */
IMAGE_VERSION 2 IMAGE_VERSION 2
#define __ASSEMBLY__
#include <config.h> #include <config.h>
/* /*

View File

@ -11,7 +11,6 @@
/* image version */ /* image version */
IMAGE_VERSION 2 IMAGE_VERSION 2
#define __ASSEMBLY__
#include <config.h> #include <config.h>
/* /*

View File

@ -3,8 +3,6 @@
* Copyright 2021 Collabora Ltd. * Copyright 2021 Collabora Ltd.
*/ */
#define __ASSEMBLY__
ROM_VERSION v2 ROM_VERSION v2
BOOT_FROM sd BOOT_FROM sd
LOADER u-boot-spl-ddr.bin 0x912000 LOADER u-boot-spl-ddr.bin 0x912000

View File

@ -7,7 +7,6 @@
* *
* The syntax is taken as close as possible with the kwbimage * The syntax is taken as close as possible with the kwbimage
*/ */
#define __ASSEMBLY__
#include <config.h> #include <config.h>
/* image version */ /* image version */

View File

@ -8,7 +8,6 @@
* The syntax is taken as close as possible with the kwbimage * The syntax is taken as close as possible with the kwbimage
*/ */
#define __ASSEMBLY__
#include <config.h> #include <config.h>
IMAGE_VERSION 2 IMAGE_VERSION 2