diff -r 538db54a451d -r 5d2844f35677 kerneltest/e32test/hcr/hcr.inf
--- a/kerneltest/e32test/hcr/hcr.inf	Mon Jan 18 21:31:10 2010 +0200
+++ b/kerneltest/e32test/hcr/hcr.inf	Tue Jan 26 13:13:38 2010 +0200
@@ -28,56 +28,75 @@
 
 PRJ_TESTEXPORTS
 
-hcr_tests.iby				/epoc32/rom/include/hcr_tests.iby
-tshell_hcrtest.oby			../../../kernel/eka/rombuild/tshell_hcrtest.oby
-hcrtest.auto.bat			/epoc32/rom/include/hcrtest.auto.bat
-hcr_autoexec.bat			/epoc32/rom/include/hcr_autoexec.bat
-smr1.oby					/epoc32/rom/include/smr1.oby
+hcr_tests.iby			/epoc32/rom/include/hcr_tests.iby
+tshell_hcrtest.oby		../../../kernel/eka/rombuild/tshell_hcrtest.oby
+nandloader_hcrtest.oby	../../../kernel/eka/rombuild/nandloader_hcrtest.oby
+
+hcrtest.auto.bat	/epoc32/rom/include/hcrtest.auto.bat
+hcr_autoexec.bat	/epoc32/rom/include/hcr_autoexec.bat
+smr1.oby			/epoc32/rom/include/smr1.oby
+
+// Export smr1.img for non-btb manual ad-hoc on target testing
+// File autogenerated from smr1.oby above into the eka\rombuild folder 
+// in BTB test run.
+smr1.img			/epoc32/data/smr1.img
+SMR_PART_1024.img	/epoc32/data/smr_part_1024.img
+SMR_PART_10240.img	/epoc32/data/smr_part_10240.img
+SMR_PART_102400.img	/epoc32/data/smr_part_102400.img
+
 
 // The emulator test data exported next must match that included into a
 // ROM for the HCR Test suite. See hcr_tests.iby
 
-filerepos.dat				/epoc32/release/wins/udeb/z/sys/data/filerepos.dat
-nandrepos.dat				/epoc32/release/wins/udeb/z/sys/data/nandrepos.dat
-corrupt1.dat				/epoc32/release/wins/udeb/z/sys/data/corrupt1.dat
-corrupt2.dat				/epoc32/release/wins/udeb/z/sys/data/corrupt2.dat
-empty.dat					/epoc32/release/wins/udeb/z/sys/data/empty.dat
-megalarge1.dat				/epoc32/release/wins/udeb/z/sys/data/megalarge1.dat
-megalarge2.dat				/epoc32/release/wins/udeb/z/sys/data/megalarge2.dat
-filerepos.dat				/epoc32/release/wins/udeb/Z/sys/data/hcr.dat
+filerepos_bc0.dat     /epoc32/release/wins/udeb/z/sys/data/filerepos_bc0.dat
+filerepos_bc1.dat     /epoc32/release/wins/udeb/z/sys/data/filerepos_bc1.dat
+filerepos.dat         /epoc32/release/wins/udeb/z/sys/data/filerepos.dat
+nandrepos.dat         /epoc32/release/wins/udeb/z/sys/data/nandrepos.dat
+corrupt1.dat          /epoc32/release/wins/udeb/z/sys/data/corrupt1.dat
+corrupt2.dat          /epoc32/release/wins/udeb/z/sys/data/corrupt2.dat
+empty.dat             /epoc32/release/wins/udeb/z/sys/data/empty.dat
+megalarge1.dat        /epoc32/release/wins/udeb/z/sys/data/megalarge1.dat
+megalarge2.dat        /epoc32/release/wins/udeb/z/sys/data/megalarge2.dat
+filerepos.dat         /epoc32/release/wins/udeb/z/sys/data/hcr.dat
 
-filerepos.dat				/epoc32/release/wins/urel/z/sys/data/filerepos.dat
-nandrepos.dat				/epoc32/release/wins/urel/z/sys/data/nandrepos.dat
-corrupt1.dat				/epoc32/release/wins/urel/z/sys/data/corrupt1.dat
-corrupt2.dat				/epoc32/release/wins/urel/z/sys/data/corrupt2.dat
-empty.dat					/epoc32/release/wins/urel/z/sys/data/empty.dat
-megalarge1.dat				/epoc32/release/wins/urel/z/sys/data/megalarge1.dat
-megalarge2.dat				/epoc32/release/wins/urel/z/sys/data/megalarge2.dat
-filerepos.dat				/epoc32/release/wins/urel/Z/sys/data/hcr.dat
+filerepos_bc0.dat     /epoc32/release/wins/urel/z/sys/data/filerepos_bc0.dat
+filerepos_bc1.dat     /epoc32/release/wins/urel/z/sys/data/filerepos_bc1.dat
+filerepos.dat         /epoc32/release/wins/urel/z/sys/data/filerepos.dat
+nandrepos.dat         /epoc32/release/wins/urel/z/sys/data/nandrepos.dat
+corrupt1.dat          /epoc32/release/wins/urel/z/sys/data/corrupt1.dat
+corrupt2.dat          /epoc32/release/wins/urel/z/sys/data/corrupt2.dat
+empty.dat             /epoc32/release/wins/urel/z/sys/data/empty.dat
+megalarge1.dat        /epoc32/release/wins/urel/z/sys/data/megalarge1.dat
+megalarge2.dat        /epoc32/release/wins/urel/z/sys/data/megalarge2.dat
+filerepos.dat         /epoc32/release/wins/urel/z/sys/data/hcr.dat
 
-filerepos.dat				/epoc32/release/winscw/udeb/z/sys/data/filerepos.dat
-nandrepos.dat				/epoc32/release/winscw/udeb/z/sys/data/nandrepos.dat
-corrupt1.dat				/epoc32/release/winscw/udeb/z/sys/data/corrupt1.dat
-corrupt2.dat				/epoc32/release/winscw/udeb/z/sys/data/corrupt2.dat
-empty.dat					/epoc32/release/winscw/udeb/z/sys/data/empty.dat
-megalarge1.dat				/epoc32/release/winscw/udeb/z/sys/data/megalarge1.dat
-megalarge2.dat				/epoc32/release/winscw/udeb/z/sys/data/megalarge2.dat
-filerepos.dat				/epoc32/release/winscw/udeb/Z/sys/data/hcr.dat
+filerepos_bc0.dat     /epoc32/release/winscw/udeb/z/sys/data/filerepos_bc0.dat
+filerepos_bc1.dat     /epoc32/release/winscw/udeb/z/sys/data/filerepos_bc1.dat
+filerepos.dat         /epoc32/release/winscw/udeb/z/sys/data/filerepos.dat
+nandrepos.dat         /epoc32/release/winscw/udeb/z/sys/data/nandrepos.dat
+corrupt1.dat          /epoc32/release/winscw/udeb/z/sys/data/corrupt1.dat
+corrupt2.dat          /epoc32/release/winscw/udeb/z/sys/data/corrupt2.dat
+empty.dat             /epoc32/release/winscw/udeb/z/sys/data/empty.dat
+megalarge1.dat        /epoc32/release/winscw/udeb/z/sys/data/megalarge1.dat
+megalarge2.dat        /epoc32/release/winscw/udeb/z/sys/data/megalarge2.dat
+filerepos.dat         /epoc32/release/winscw/udeb/z/sys/data/hcr.dat
 
-filerepos.dat				/epoc32/release/winscw/urel/z/sys/data/filerepos.dat
-nandrepos.dat				/epoc32/release/winscw/urel/z/sys/data/nandrepos.dat
-corrupt1.dat				/epoc32/release/winscw/urel/z/sys/data/corrupt1.dat
-corrupt2.dat				/epoc32/release/winscw/urel/z/sys/data/corrupt2.dat
-empty.dat					/epoc32/release/winscw/urel/z/sys/data/empty.dat
-megalarge1.dat				/epoc32/release/winscw/urel/z/sys/data/megalarge1.dat
-megalarge2.dat				/epoc32/release/winscw/urel/z/sys/data/megalarge2.dat
-filerepos.dat				/epoc32/release/winscw/urel/Z/sys/data/hcr.dat
+filerepos_bc0.dat     /epoc32/release/winscw/urel/z/sys/data/filerepos_bc0.dat
+filerepos_bc1.dat     /epoc32/release/winscw/urel/z/sys/data/filerepos_bc1.dat
+filerepos.dat         /epoc32/release/winscw/urel/z/sys/data/filerepos.dat
+nandrepos.dat         /epoc32/release/winscw/urel/z/sys/data/nandrepos.dat
+corrupt1.dat          /epoc32/release/winscw/urel/z/sys/data/corrupt1.dat
+corrupt2.dat          /epoc32/release/winscw/urel/z/sys/data/corrupt2.dat
+empty.dat             /epoc32/release/winscw/urel/z/sys/data/empty.dat
+megalarge1.dat        /epoc32/release/winscw/urel/z/sys/data/megalarge1.dat
+megalarge2.dat        /epoc32/release/winscw/urel/z/sys/data/megalarge2.dat
+filerepos.dat         /epoc32/release/winscw/urel/z/sys/data/hcr.dat
 
 PRJ_TESTMMPFILES
 
-d_hcrsim_client				support
-d_hcrsim_own				support
-d_hcrut 					support
+d_hcrsim_client       support
+d_hcrsim_own        support
+d_hcrut           support
 
 #ifndef SMP
 t_hcr