[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [microblaze-uclinux] [PATCH 2/2] microblaze: Fix problem with missing CONFIG_UARTLITE config for older designs



applied to svn, thanks


On Sun, May 17, 2009 at 4:22 AM, Chris Robson <Chris.Robson@xxxxxxxxxxxx> wrote:
>
> Michal
>
> Sorry for being late...............
>
> So here is the quick install/build test:
>
> 1.  Untar the file: petalinux-v0.40-rc2.tar.gz
> 2.  Apply your last 2 patches. (obviously this step will be OBE)
> 3.  Run make menuconfig, select nothing, exit and save configuration file
> 4.  Run make
>
> Results:  Clean build with no errors.
>
> This accomplishes what I was looking for as a baseline.
>
> Thanks..........Chris
>
> Michal Simek wrote:
>>
>> Signed-off-by: Michal Simek <monstr@xxxxxxxxx>
>> ---
>>  .../platform/Xilinx-Spartan3E1600-MMU/Kconfig.auto |   11 +++++++++++
>>  .../Xilinx-Spartan3E1600-RevA/Kconfig.auto         |   11 +++++++++++
>>  .../platform/Xilinx-Spartan3E500-MMU/Kconfig.auto  |   11 +++++++++++
>>  .../platform/Xilinx-Spartan3E500-RevC/Kconfig.auto |   11 +++++++++++
>>  .../platform/Xilinx-Spartan3E500-RevD/Kconfig.auto |   11 +++++++++++
>>  .../platform/microblaze-auto/Kconfig.auto          |   11 +++++++++++
>>  .../PetaLogix/microblaze-auto/config.linux-2.6.x   |    2 ++
>>  .../Xilinx/Spartan3E1600-MMU/config.linux-2.6.x    |    2 ++
>>  .../Spartan3E1600-RevA-SGDMA/config.linux-2.6.x    |    2 ++
>>  .../Xilinx/Spartan3E500-RevC/config.linux-2.6.x    |    2 ++
>>  .../Xilinx/Spartan3E500-RevD/config.linux-2.6.x    |    2 ++
>>  11 files changed, 76 insertions(+), 0 deletions(-)
>>
>> diff --git
>> a/software/linux-2.6.x-petalogix/arch/microblaze/platform/Xilinx-Spartan3E1600-MMU/Kconfig.auto
>> b/software/linux-2.6.x-petalogix/arch/microblaze/platform/Xilinx-Spartan3E1600-MMU/Kconfig.auto
>> index 3037a08..3fffed6 100644
>> ---
>> a/software/linux-2.6.x-petalogix/arch/microblaze/platform/Xilinx-Spartan3E1600-MMU/Kconfig.auto
>> +++
>> b/software/linux-2.6.x-petalogix/arch/microblaze/platform/Xilinx-Spartan3E1600-MMU/Kconfig.auto
>> @@ -6,6 +6,17 @@
>>  #  ############################################################
>>  +# Stdin/Stdout periphery
>> +comment "Stdin/Stdout periphery"
>> +      depends on ALLOW_EDIT_AUTO
>> +
>> +config UARTLITE
>> +       int "Stdin/Stdout IP" if ALLOW_EDIT_AUTO
>> +       default 1
>> +
>> +config STDINOUT_BASEADDR
>> +       hex "Stdin/Stdout Baseaddr" if ALLOW_EDIT_AUTO
>> +       default 0x40600000
>>   # MAIN_MEMORY Settings
>>  comment "MAIN_MEMORY Settings"
>> diff --git
>> a/software/linux-2.6.x-petalogix/arch/microblaze/platform/Xilinx-Spartan3E1600-RevA/Kconfig.auto
>> b/software/linux-2.6.x-petalogix/arch/microblaze/platform/Xilinx-Spartan3E1600-RevA/Kconfig.auto
>> index 00209d0..915b632 100644
>> ---
>> a/software/linux-2.6.x-petalogix/arch/microblaze/platform/Xilinx-Spartan3E1600-RevA/Kconfig.auto
>> +++
>> b/software/linux-2.6.x-petalogix/arch/microblaze/platform/Xilinx-Spartan3E1600-RevA/Kconfig.auto
>> @@ -15,6 +15,17 @@ config PROJECT_NAME
>>        string "Project folder path" if ALLOW_EDIT_AUTO
>>        default
>> "/home/projects/kerajet/petalogix-svn/1/trunk/hardware/user-platforms/Xilinx-Spartan3E1600-MMU-RevA-edk101-plb"
>>  +# Stdin/Stdout periphery
>> +comment "Stdin/Stdout periphery"
>> +      depends on ALLOW_EDIT_AUTO
>> +
>> +config UARTLITE
>> +       int "Stdin/Stdout IP" if ALLOW_EDIT_AUTO
>> +       default 1
>> +
>> +config STDINOUT_BASEADDR
>> +       hex "Stdin/Stdout Baseaddr" if ALLOW_EDIT_AUTO
>> +       default 0x40600000
>>   # MAIN_MEMORY Settings
>>  comment "MAIN_MEMORY Settings"
>> diff --git
>> a/software/linux-2.6.x-petalogix/arch/microblaze/platform/Xilinx-Spartan3E500-MMU/Kconfig.auto
>> b/software/linux-2.6.x-petalogix/arch/microblaze/platform/Xilinx-Spartan3E500-MMU/Kconfig.auto
>> index 2753839..e2f0409 100644
>> ---
>> a/software/linux-2.6.x-petalogix/arch/microblaze/platform/Xilinx-Spartan3E500-MMU/Kconfig.auto
>> +++
>> b/software/linux-2.6.x-petalogix/arch/microblaze/platform/Xilinx-Spartan3E500-MMU/Kconfig.auto
>> @@ -6,6 +6,17 @@
>>  #  ############################################################
>>  +# Stdin/Stdout periphery
>> +comment "Stdin/Stdout periphery"
>> +      depends on ALLOW_EDIT_AUTO
>> +
>> +config UARTLITE
>> +       int "Stdin/Stdout IP" if ALLOW_EDIT_AUTO
>> +       default 1
>> +
>> +config STDINOUT_BASEADDR
>> +       hex "Stdin/Stdout Baseaddr" if ALLOW_EDIT_AUTO
>> +       default 0x40600000
>>   # MAIN_MEMORY Settings
>>  comment "MAIN_MEMORY Settings"
>> diff --git
>> a/software/linux-2.6.x-petalogix/arch/microblaze/platform/Xilinx-Spartan3E500-RevC/Kconfig.auto
>> b/software/linux-2.6.x-petalogix/arch/microblaze/platform/Xilinx-Spartan3E500-RevC/Kconfig.auto
>> index ef2d7a2..b8b2d7e 100644
>> ---
>> a/software/linux-2.6.x-petalogix/arch/microblaze/platform/Xilinx-Spartan3E500-RevC/Kconfig.auto
>> +++
>> b/software/linux-2.6.x-petalogix/arch/microblaze/platform/Xilinx-Spartan3E500-RevC/Kconfig.auto
>> @@ -6,6 +6,17 @@
>>  #  ############################################################
>>  +# Stdin/Stdout periphery
>> +comment "Stdin/Stdout periphery"
>> +      depends on ALLOW_EDIT_AUTO
>> +
>> +config UARTLITE
>> +       int "Stdin/Stdout IP" if ALLOW_EDIT_AUTO
>> +       default 1
>> +
>> +config STDINOUT_BASEADDR
>> +       hex "Stdin/Stdout Baseaddr" if ALLOW_EDIT_AUTO
>> +       default 0x40600000
>>   # Project name
>>  comment "Project name"
>> diff --git
>> a/software/linux-2.6.x-petalogix/arch/microblaze/platform/Xilinx-Spartan3E500-RevD/Kconfig.auto
>> b/software/linux-2.6.x-petalogix/arch/microblaze/platform/Xilinx-Spartan3E500-RevD/Kconfig.auto
>> index 05eda15..50df05a 100644
>> ---
>> a/software/linux-2.6.x-petalogix/arch/microblaze/platform/Xilinx-Spartan3E500-RevD/Kconfig.auto
>> +++
>> b/software/linux-2.6.x-petalogix/arch/microblaze/platform/Xilinx-Spartan3E500-RevD/Kconfig.auto
>> @@ -6,6 +6,17 @@
>>  #  ############################################################
>>  +# Stdin/Stdout periphery
>> +comment "Stdin/Stdout periphery"
>> +      depends on ALLOW_EDIT_AUTO
>> +
>> +config UARTLITE
>> +       int "Stdin/Stdout IP" if ALLOW_EDIT_AUTO
>> +       default 1
>> +
>> +config STDINOUT_BASEADDR
>> +       hex "Stdin/Stdout Baseaddr" if ALLOW_EDIT_AUTO
>> +       default 0x40600000
>>   # Project name
>>  comment "Project name"
>> diff --git
>> a/software/linux-2.6.x-petalogix/arch/microblaze/platform/microblaze-auto/Kconfig.auto
>> b/software/linux-2.6.x-petalogix/arch/microblaze/platform/microblaze-auto/Kconfig.auto
>> index f5ef9c4..801312a 100644
>> ---
>> a/software/linux-2.6.x-petalogix/arch/microblaze/platform/microblaze-auto/Kconfig.auto
>> +++
>> b/software/linux-2.6.x-petalogix/arch/microblaze/platform/microblaze-auto/Kconfig.auto
>> @@ -6,6 +6,17 @@
>>  #  ############################################################
>>  +# Stdin/Stdout periphery
>> +comment "Stdin/Stdout periphery"
>> +      depends on ALLOW_EDIT_AUTO
>> +
>> +config UARTLITE
>> +       int "Stdin/Stdout IP" if ALLOW_EDIT_AUTO
>> +       default 1
>> +
>> +config STDINOUT_BASEADDR
>> +       hex "Stdin/Stdout Baseaddr" if ALLOW_EDIT_AUTO
>> +       default 0x40600000
>>   # MAIN_MEMORY Settings
>>  comment "MAIN_MEMORY Settings"
>> diff --git
>> a/software/petalinux-dist/vendors/PetaLogix/microblaze-auto/config.linux-2.6.x
>> b/software/petalinux-dist/vendors/PetaLogix/microblaze-auto/config.linux-2.6.x
>> index 439fc5b..1b312e2 100644
>> ---
>> a/software/petalinux-dist/vendors/PetaLogix/microblaze-auto/config.linux-2.6.x
>> +++
>> b/software/petalinux-dist/vendors/PetaLogix/microblaze-auto/config.linux-2.6.x
>> @@ -92,6 +92,8 @@ CONFIG_PLATFORM_MICROBLAZE_AUTO=y
>>  # CONFIG_PLATFORM_XILINX_ML401 is not set
>>  # CONFIG_PLATFORM_XILINX_S3E1600_STARTER is not set
>>  # CONFIG_ALLOW_EDIT_AUTO is not set
>> +CONFIG_UARTLITE=1
>> +CONFIG_STDINOUT_BASEADDR=0x40600000
>>  CONFIG_XILINX_ERAM_START=0x22000000
>>  CONFIG_XILINX_ERAM_SIZE=0x02000000
>>  CONFIG_XILINX_FLASH_START=0x21000000
>> diff --git
>> a/software/petalinux-dist/vendors/Xilinx/Spartan3E1600-MMU/config.linux-2.6.x
>> b/software/petalinux-dist/vendors/Xilinx/Spartan3E1600-MMU/config.linux-2.6.x
>> index c800056..6a90f07 100644
>> ---
>> a/software/petalinux-dist/vendors/Xilinx/Spartan3E1600-MMU/config.linux-2.6.x
>> +++
>> b/software/petalinux-dist/vendors/Xilinx/Spartan3E1600-MMU/config.linux-2.6.x
>> @@ -99,6 +99,8 @@ CONFIG_PLATFORM_XILINX_SPARTAN3E1600_MMU=y
>>  # CONFIG_PLATFORM_XILINX_ML401 is not set
>>  # CONFIG_PLATFORM_XILINX_S3E1600_STARTER is not set
>>  # CONFIG_ALLOW_EDIT_AUTO is not set
>> +CONFIG_UARTLITE=1
>> +CONFIG_STDINOUT_BASEADDR=0x40600000
>>  CONFIG_XILINX_ERAM_START=0x20000000
>>  CONFIG_XILINX_ERAM_SIZE=0x02000000
>>  CONFIG_XILINX_FLASH_START=0x85000000
>> diff --git
>> a/software/petalinux-dist/vendors/Xilinx/Spartan3E1600-RevA-SGDMA/config.linux-2.6.x
>> b/software/petalinux-dist/vendors/Xilinx/Spartan3E1600-RevA-SGDMA/config.linux-2.6.x
>> index 0dc89f0..2cb31c6 100644
>> ---
>> a/software/petalinux-dist/vendors/Xilinx/Spartan3E1600-RevA-SGDMA/config.linux-2.6.x
>> +++
>> b/software/petalinux-dist/vendors/Xilinx/Spartan3E1600-RevA-SGDMA/config.linux-2.6.x
>> @@ -90,6 +90,8 @@ CONFIG_PLATFORM_XILINX_SPARTAN3E1600_REVA_SGDMA=y
>>  # CONFIG_PLATFORM_MICROBLAZE_AUTO is not set
>>  # CONFIG_PLATFORM_XILINX_ML401 is not set
>>  # CONFIG_PLATFORM_XILINX_S3E1600_STARTER is not set
>> +CONFIG_UARTLITE=1
>> +CONFIG_STDINOUT_BASEADDR=0x40600000
>>  CONFIG_XILINX_ERAM_START=0x28000000
>>  CONFIG_XILINX_ERAM_SIZE=0x02000000
>>  CONFIG_XILINX_FLASH_START=0x21000000
>> diff --git
>> a/software/petalinux-dist/vendors/Xilinx/Spartan3E500-RevC/config.linux-2.6.x
>> b/software/petalinux-dist/vendors/Xilinx/Spartan3E500-RevC/config.linux-2.6.x
>> index 0121cea..8030866 100644
>> ---
>> a/software/petalinux-dist/vendors/Xilinx/Spartan3E500-RevC/config.linux-2.6.x
>> +++
>> b/software/petalinux-dist/vendors/Xilinx/Spartan3E500-RevC/config.linux-2.6.x
>> @@ -94,6 +94,8 @@ CONFIG_PLATFORM_XILINX_SPARTAN3E500_REVC=y
>>  # CONFIG_PLATFORM_MICROBLAZE_AUTO is not set
>>  # CONFIG_PLATFORM_XILINX_ML401 is not set
>>  # CONFIG_PLATFORM_XILINX_S3E1600_STARTER is not set
>> +CONFIG_UARTLITE=1
>> +CONFIG_STDINOUT_BASEADDR=0x40600000
>>  CONFIG_XILINX_ERAM_START=0x22000000
>>  CONFIG_XILINX_ERAM_SIZE=0x02000000
>>  CONFIG_XILINX_FLASH_START=0x21000000
>> diff --git
>> a/software/petalinux-dist/vendors/Xilinx/Spartan3E500-RevD/config.linux-2.6.x
>> b/software/petalinux-dist/vendors/Xilinx/Spartan3E500-RevD/config.linux-2.6.x
>> index da9013a..5b320e0 100644
>> ---
>> a/software/petalinux-dist/vendors/Xilinx/Spartan3E500-RevD/config.linux-2.6.x
>> +++
>> b/software/petalinux-dist/vendors/Xilinx/Spartan3E500-RevD/config.linux-2.6.x
>> @@ -96,6 +96,8 @@ CONFIG_PLATFORM_XILINX_SPARTAN3E500_REVD=y
>>  # CONFIG_PLATFORM_MICROBLAZE_AUTO is not set
>>  # CONFIG_PLATFORM_XILINX_ML401 is not set
>>  # CONFIG_PLATFORM_XILINX_S3E1600_STARTER is not set
>> +CONFIG_UARTLITE=1
>> +CONFIG_STDINOUT_BASEADDR=0x40600000
>>  CONFIG_XILINX_ERAM_START=0x24000000
>>  CONFIG_XILINX_ERAM_SIZE=0x04000000
>>  CONFIG_XILINX_FLASH_START=0x21000000
>>
>



-- 
John Williams, PhD, B.Eng, B.IT
PetaLogix - Linux Solutions for a Reconfigurable World
w: www.petalogix.com  p: +61-7-30090663  f: +61-7-30090663

___________________________
microblaze-uclinux mailing list
microblaze-uclinux@xxxxxxxxxxxxxx
Project Home Page : http://www.itee.uq.edu.au/~jwilliams/mblaze-uclinux
Mailing List Archive : http://www.itee.uq.edu.au/~listarch/microblaze-uclinux/