head	1.4;
access;
symbols
	rel-8-1-2-sv:1.4
	import-20071105:1.1.1.1
	import-20070116:1.1.1.1
	freescale:1.1.1;
locks; strict;
comment	@# @;


1.4
date	2008.04.04.15.48.10;	author seh;	state dead;
branches;
next	1.3;
commitid	4LGH7zo3sfbm6OXs;

1.3
date	2007.11.07.14.15.05;	author seh;	state Exp;
branches;
next	1.2;
commitid	EGTWia6z4yxOmEEs;

1.2
date	2007.01.17.14.17.27;	author seh;	state Exp;
branches;
next	1.1;

1.1
date	2007.01.17.10.48.16;	author seh;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2007.01.17.10.48.16;	author seh;	state Exp;
branches;
next	;


desc
@@


1.4
log
@import-20080404-conflict-resolution
@
text
@#
# Automatically generated make config: don't edit
# LTIB version: 6.2.1
#
CONFIG_CONFIG_TITLE="LTIB: Freescale MPC8360E PB PowerPC board"
CONFIG_CPU="MPC8360EPB"
CONFIG_PLATFORM_COMMENT="Freescale MPC8360E PB PowerPC board"
CONFIG_VENDOR="Freescale"
CONFIG_PLATFORM="mpc8360epb"
CONFIG_GNUTARCH="powerpc"
CONFIG_CFGHOST="powerpc-linux"

#
# Choose the platform revision
#
# CONFIG_PLATFORM_REV1 is not set
CONFIG_PLATFORM_REV2=y
CONFIG_ENDIAN="big"

#
# Choose the target C library type
#
CONFIG_GLIBC=y
# CONFIG_UCLIBC is not set

#
# Choose your toolchain
#
CONFIG_TOOLCHAIN1=y
# CONFIG_TOOLCHAIN2 is not set
# CONFIG_TOOLCHAIN3 is not set
# CONFIG_TOOLCHAIN_CUSTOM is not set
CONFIG_TOOLCHAIN="mtwk-lnx-powerpc-gcc-3.4.3-glibc-2.3.3-0.28-1.i686.rpm"
CONFIG_TOOLCHAIN_PATH="/opt/mtwk/usr/local/powerpc-linux/gcc-3.4.3-glibc-2.3.3"
CONFIG_TOOLCHAIN_PREFIX="powerpc-linux-"
CONFIG_TOOLCHAIN_CFLAGS=""

#
# Choose bootloader
#
CONFIG_BOOTLOADER1=y
# CONFIG_BOOTLOADER2 is not set
# CONFIG_BOOTLOADER_NONE is not set
CONFIG_PKG_U_BOOT="u-boot-1.1.3-mpc8360epb-rev2"
CONFIG_PKG_U_BOOT_GENERAL=y
# CONFIG_PKG_U_BOOT_PCI33M is not set
# CONFIG_PKG_U_BOOT_PCI66M is not set
# CONFIG_PKG_U_BOOT_PCIAGENT is not set
CONFIG_PKG_U_BOOT_CONFIG_TYPE="MPC8360EPB_config"
CONFIG_PKG_U_BOOT_BUILD_ARGS="OPTFLAGS=-Os"

#
# Choose your Kernel
#
CONFIG_KERNEL1=y
# CONFIG_KERNEL2 is not set
# CONFIG_KERNEL_DIR_BUILD is not set
# CONFIG_KERNEL_NONE is not set
CONFIG_PKG_KERNEL="kernel-2.6.11-mpc8360epb-rev2"

#
# Choose the Linux Target Architecture
#
CONFIG_LINTARCH_PPC=y
# CONFIG_LINTARCH_POWERPC is not set
CONFIG_LINTARCH="ppc"
CONFIG_KERNEL_CONFIG1=y
# CONFIG_KERNEL_CONFIG2 is not set
# CONFIG_KERNEL_CONFIG3 is not set
# CONFIG_KERNEL_CONFIG4 is not set
# CONFIG_KERNEL_CONFIG5 is not set
# CONFIG_KERNEL_CONFIG6 is not set
# CONFIG_KERNEL_CONFIG7 is not set
# CONFIG_KERNEL_CONFIG8 is not set
# CONFIG_KERNEL_CONFIG9 is not set
# CONFIG_KERNEL_CONFIG_CUSTOM is not set
CONFIG_PKG_KERNEL_PRECONFIG="linux-2.6.11-mpc8360epb-rev2-basic.config"
# CONFIG_PKG_KERNEL_WANT_HEADERS is not set
# CONFIG_PKG_KERNEL_WANT_CF is not set
# CONFIG_PKG_KERNEL_LEAVESRC is not set
CONFIG_DISTRO="dist/lfs-5.1"

#
# Package selection
#

#
# Package list
#
CONFIG_PKG_APPTRK_PPCBIN=y
# CONFIG_PKG_AUTOCONF is not set
# CONFIG_PKG_AUTOMAKE is not set
CONFIG_LIBC_WANTED=y
CONFIG_PKG_LIBC="base_libs"
# CONFIG_PKG_LIBC_WANT_LOCALES is not set
# CONFIG_PKG_LIBC_WANT_HEADERS is not set
# CONFIG_PKG_LIBC_WANT_STATIC_LIBS is not set
# CONFIG_PKG_ALSA_LIB is not set
# CONFIG_PKG_ALSA_UTILS is not set
# CONFIG_PKG_BASH is not set
# CONFIG_PKG_BIND is not set
# CONFIG_PKG_BINUTILS is not set
# CONFIG_PKG_BISON is not set
# CONFIG_PKG_BOA is not set
# CONFIG_PKG_BONNIE_PLUS_PLUS is not set
# CONFIG_PKG_BRIDGE_UTILS is not set
CONFIG_PKG_BUSYBOX=y
CONFIG_PKG_BUSYBOX_PRECONFIG="busybox.config"
# CONFIG_PKG_BUSYBOX_WANT_CF is not set
# CONFIG_PKG_BZIP2 is not set
# CONFIG_PKG_CAN4LINUX is not set
# CONFIG_PKG_CLAMAV is not set
# CONFIG_PKG_COREUTILS is not set
# CONFIG_PKG_CPIO is not set
# CONFIG_PKG_CRACKLIB is not set
# CONFIG_PKG_CRAMFS is not set
# CONFIG_PKG_DAEMONIZER is not set
# CONFIG_PKG_DEVMEM2 is not set
# CONFIG_PKG_DHCP is not set
# CONFIG_PKG_DB1 is not set
CONFIG_PKG_DEV=y
# CONFIG_PKG_DEVFSD is not set
# CONFIG_PKG_DEV_NONE is not set
# CONFIG_PKG_DIFFUTILS is not set
# CONFIG_PKG_DIRECTFB is not set
# CONFIG_PKG_DISTCC is not set
# CONFIG_PKG_DOSFSTOOLS is not set
# CONFIG_PKG_DROPBEAR is not set
# CONFIG_PKG_DTC is not set
# CONFIG_PKG_E2FSPROGS is not set
# CONFIG_PKG_ED is not set
# CONFIG_PKG_ETHTOOL is not set
# CONFIG_PKG_EXPAT is not set
# CONFIG_PKG_FAKEROOT is not set
CONFIG_PKG_FAKE_PROVIDES=y
# CONFIG_PKG_FINDUTILS is not set
CONFIG_PKG_FLEX=y
# CONFIG_PKG_FREETYPE is not set
# CONFIG_PKG_GAWK is not set
# CONFIG_PKG_GCC is not set
# CONFIG_PKG_GDB is not set
# CONFIG_PKG_GENEXT2FS is not set
# CONFIG_PKG_GENROMFS is not set
# CONFIG_PKG_GETTEXT is not set
# CONFIG_PKG_GMP is not set
# CONFIG_PKG_GREP is not set
# CONFIG_PKG_GROFF is not set
# CONFIG_PKG_HDPARM is not set
# CONFIG_PKG_HELLOWORLD is not set
# CONFIG_PKG_HESIOD is not set
# CONFIG_PKG_HOTPLUG is not set
# CONFIG_PKG_HTTPD is not set
CONFIG_PKG_I2C_TOOLS=y
# CONFIG_PKG_IPROUTE is not set
# CONFIG_PKG_PIDENTD is not set
# CONFIG_PKG_INETUTILS is not set
# CONFIG_PKG_IPERF is not set
# CONFIG_PKG_IPSEC_TOOLS is not set
# CONFIG_PKG_IPSECADM is not set
# CONFIG_PKG_IPTABLES is not set
# CONFIG_PKG_IPUTILS is not set
# CONFIG_PKG_IRATTACH is not set
# CONFIG_PKG_KBD is not set
# CONFIG_PKG_LESS is not set
# CONFIG_PKG_LFS_UTILS is not set
# CONFIG_PKG_LIBID3TAG is not set
# CONFIG_PKG_LIBMAD is not set
# CONFIG_PKG_LIBJPEG is not set
# CONFIG_PKG_LIBELF is not set
# CONFIG_PKG_LIBPCAP is not set
# CONFIG_PKG_LIBPNG is not set
# CONFIG_PKG_LIBTERMCAP is not set
# CONFIG_PKG_LIBTOOL is not set
# CONFIG_PKG_LIBUSB is not set
# CONFIG_PKG_LIBXML2 is not set
CONFIG_PKG_LINUX_ATM=y
# CONFIG_PKG_LINUX_WLAN is not set
# CONFIG_PKG_LKC is not set
# CONFIG_PKG_LTP is not set
# CONFIG_PKG_LMBENCH is not set
# CONFIG_PKG_LRZSZ is not set
# CONFIG_PKG_M4 is not set
# CONFIG_PKG_MADPLAY is not set
# CONFIG_PKG_MAKE is not set
# CONFIG_PKG_MAN is not set
# CONFIG_PKG_MDADM is not set
CONFIG_PKG_MERGE=y
# CONFIG_PKG_MICROWINDOWS is not set
# CONFIG_PKG_MODUTILS is not set
CONFIG_PKG_MODULE_INIT_TOOLS=y
# CONFIG_MODUTILS_NONE is not set
# CONFIG_PKG_MTD_UTILS is not set
# CONFIG_PKG_MYSQL is not set
# CONFIG_PKG_NCURSES is not set
# CONFIG_PKG_NET_TOOLS is not set
# CONFIG_PKG_NETPERF is not set
CONFIG_PKG_NTPCLIENT=y
# CONFIG_PKG_OPENSSH is not set
# CONFIG_PKG_OPENSSL is not set
# CONFIG_PKG_OPENSWAN is not set
# CONFIG_PKG_OPROFILE is not set
# CONFIG_PKG_PATCH is not set
CONFIG_PKG_PCIUTILS=y
# CONFIG_PKG_PCMCIA_CS is not set
# CONFIG_PKG_PCRE is not set
# CONFIG_PKG_PERL is not set
# CONFIG_PKG_PHP is not set
# CONFIG_PKG_POPT is not set
# CONFIG_PKG_PORTMAP is not set
# CONFIG_PKG_PPP is not set
# CONFIG_PKG_PROCINFO is not set
# CONFIG_PKG_PROCPS is not set
# CONFIG_PKG_PSMISC is not set
CONFIG_PKG_PTPD=y
# CONFIG_PKG_PYTHON is not set
# CONFIG_PKG_QTOPIA is not set
# CONFIG_PKG_RPM is not set
# CONFIG_PKG_RNG_TOOLS is not set
# CONFIG_PKG_RSYNC is not set
# CONFIG_PKG_SAMBA is not set
# CONFIG_PKG_SASH is not set
# CONFIG_PKG_SCHEDUTILS is not set
# CONFIG_PKG_SCREEN is not set
# CONFIG_PKG_SED is not set
# CONFIG_PKG_SEQ is not set
# CONFIG_PKG_SETSERIAL is not set
CONFIG_PKG_SKELL=y
# CONFIG_PKG_SKELL_WANT_TERMINFO is not set
# CONFIG_PKG_STRACE is not set
CONFIG_PKG_SYSCONFIG=y
# CONFIG_PKG_SYSKLOGD is not set
# CONFIG_PKG_SYSVINIT is not set
# CONFIG_PKG_TAR is not set
# CONFIG_PKG_TCPDUMP is not set
# CONFIG_PKG_TCP_WRAPPERS is not set
# CONFIG_PKG_TEXINFO is not set
# CONFIG_PKG_TIME is not set
# CONFIG_PKG_TIMEZONE is not set
# CONFIG_PKG_TINYLOGIN is not set
# CONFIG_PKG_UDEV is not set
# CONFIG_PKG_USBUTILS is not set
# CONFIG_PKG_UCLINUX_CKSUM is not set
# CONFIG_PKG_UTIL_LINUX is not set
# CONFIG_PKG_U_BOOT_TOOLS is not set
# CONFIG_PKG_UNZIP is not set
# CONFIG_PKG_VIM is not set
# CONFIG_PKG_VSFTPD is not set
# CONFIG_PKG_WGET is not set
# CONFIG_PKG_WHICH is not set
# CONFIG_PKG_WIRELESS_TOOLS is not set
# CONFIG_PKG_YAFFS_UTILS is not set
# CONFIG_PKG_ZLIB is not set

#
# Target System Configuration
#

#
# Options
#
CONFIG_SYSCFG_HOSTNAME="freescale"
CONFIG_SYSCFG_WANT_LOGIN_TTY=y
CONFIG_SYSCFG_LOGING_TTY="::respawn:/sbin/getty -L ttyS0 115200 vt100"
CONFIG_SYSCFG_MODLIST=""
# CONFIG_SYSCFG_START_DEVFSD is not set
CONFIG_SYSCFG_START_NETWORK=y

#
# Network setup
#

#
# 
#
CONFIG_SYSCFG_IFACE0=y
CONFIG_SYSCFG_NET_INTERFACE0="eth0"
# CONFIG_SYSCFG_DHCPC0 is not set
CONFIG_SYSCFG_IPADDR0="192.168.0.254"
CONFIG_SYSCFG_NET_MASK0="255.255.255.0"
CONFIG_SYSCFG_NET_BROADCAST0="192.168.0.255"
CONFIG_SYSCFG_NET_GATEWAY0="192.168.0.1"
CONFIG_SYSCFG_NAMESERVER0="192.168.0.1"

#
# 
#
# CONFIG_SYSCFG_IFACE1 is not set

#
# 
#
# CONFIG_SYSCFG_IFACE2 is not set

#
# 
#
# CONFIG_SYSCFG_IFACE3 is not set

#
# 
#
# CONFIG_SYSCFG_IFACE4 is not set
# CONFIG_SYSCFG_SETTIME is not set
# CONFIG_SYSCFG_START_SYSLOG is not set
CONFIG_SYSCFG_START_INETD=y
CONFIG_SYSCFG_INETD_ARGS=""

#
# Target Image Generation
#

#
# Options
#

#
# Choose your root filesystem image type
#
# CONFIG_DEPLOYMENT_JFFS2 is not set
CONFIG_DEPLOYMENT_RAMDISK=y
# CONFIG_DEPLOYMENT_CRAMFS is not set
# CONFIG_DEPLOYMENT_ROMFS is not set
# CONFIG_DEPLOYMENT_NFS is not set
CONFIG_SYSCFG_DEPLOYMENT_STYLE="RAMDISK"
# CONFIG_SYSCFG_READONLY_FS is not set
CONFIG_SYSCFG_RAM_DIRS=""
CONFIG_DEPLOYMENT_RAMDISK_U_BOOT=y
CONFIG_DEPLOYMENT_ROOTFS_DIR=""
# CONFIG_DEPLOYMENT_ROOTFS_KEEPSTAGE is not set
CONFIG_DEPLOYMENT_RM_DOCS=y
CONFIG_DEPLOYMENT_RM_BOOT=y
CONFIG_DEPLOYMENT_RM_USR_SRC=y
CONFIG_DEPLOYMENT_RM_USR_INCLUDE=y
CONFIG_DEPLOYMENT_RM_USER_DIRS=""
CONFIG_DEPLOYMENT_RM_USER_FILES=""
CONFIG_DEPLOYMENT_RM_STATIC_LIBS=y
CONFIG_DEPLOYMENT_STRIP=y
CONFIG_DEPLOYMENT_PADDING_KB="0"
CONFIG_ERASE_BLOCK_SIZE="64"
CONFIG_CAP_UCLIBC=y
CONFIG_CAP_GLIBC=y
CONFIG_CAP_LFS_5_1=y
CONFIG_SYSCFG_TMPFS="tmpfs"
CONFIG_INITTAB_LINE="::respawn:/sbin/getty -L console 0 screen"
CONFIG_LTIB_RELEASE="6.2.1"
@


1.3
log
@import-20071105 conflig resolution commit
@
text
@@


1.2
log
@udpate mpc8360epb/defconfig-oib to be the right version
@
text
@a10 1
CONFIG_LINTARCH="ppc"
d41 2
a42 2
# CONFIG_BOOTLOADER1 is not set
CONFIG_BOOTLOADER2=y
d44 6
a49 6
CONFIG_PKG_U_BOOT="u-boot-1.1.6-mpc8360epb"
CONFIG_PKG_U_BOOT_EMDS_GENERAL=y
# CONFIG_PKG_U_BOOT_EMDS_PCI33M is not set
# CONFIG_PKG_U_BOOT_EMDS_PCI66M is not set
# CONFIG_PKG_U_BOOT_EMDS_PCIAGENT is not set
CONFIG_PKG_U_BOOT_CONFIG_TYPE="MPC8360EMDS_config"
d55 2
a56 2
# CONFIG_KERNEL1 is not set
CONFIG_KERNEL2=y
d59 8
a66 1
CONFIG_PKG_KERNEL="kernel-2.6.19-mpc8360epb"
d77 1
a77 1
CONFIG_PKG_KERNEL_PRECONFIG="linux-2.6.19-mpc8360epb-basic.config"
a149 1
# CONFIG_PKG_HELLOWORLD_MOD is not set
@


1.1
log
@Initial revision
@
text
@d11 1
d42 2
a43 2
CONFIG_BOOTLOADER1=y
# CONFIG_BOOTLOADER2 is not set
d45 6
a50 6
CONFIG_PKG_U_BOOT="u-boot-1.1.3-mpc8360epb-rev2"
CONFIG_PKG_U_BOOT_GENERAL=y
# CONFIG_PKG_U_BOOT_PCI33M is not set
# CONFIG_PKG_U_BOOT_PCI66M is not set
# CONFIG_PKG_U_BOOT_PCIAGENT is not set
CONFIG_PKG_U_BOOT_CONFIG_TYPE="MPC8360EPB_config"
d56 2
a57 2
CONFIG_KERNEL1=y
# CONFIG_KERNEL2 is not set
d60 1
a60 8
CONFIG_PKG_KERNEL="kernel-2.6.11-mpc8360epb-rev2"

#
# Choose the Linux Target Architecture
#
CONFIG_LINTARCH_PPC=y
# CONFIG_LINTARCH_POWERPC is not set
CONFIG_LINTARCH="ppc"
d71 1
a71 1
CONFIG_PKG_KERNEL_PRECONFIG="linux-2.6.11-mpc8360epb-rev2-basic.config"
d144 1
@


1.1.1.1
log
@Import from fsl 20070116
@
text
@@
